Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/router/modules/supply.js

@@ -81,13 +81,16 @@ export default {
       component: () => import('@/xt_pages/supply/components/editGoodOrder'),
       name: 'editGoodOrder',
       meta: { title: 'editGoodOrder', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
     },
     // 退货单模块
     {
       path: '/good/return/query',
       component: () => import('@/xt_pages/supply/goodreturn'),
       name: 'goodReturnQuery',
-      meta: { title: 'goodReturnQuery', noCache: true },
+      meta: { title: 'goodReturnQuery', noCache: true }
     },
     {
       path: '/good/return/add',

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
-        </div>
+        </div> -->
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -771,14 +771,15 @@ getTimes(time) {
             //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
           
             if(arr.length == 0){
-              this.$message.error("该订单已全部生成采购单，请知悉!")
-              return
+              is_warehouse = 1
+              this.ModefySupplyWarehousing(is_warehouse,warehousing_id)
             }
             
-
+            //部分入库
             if(total!=goodOrder.length){
-              str = arr.join(",")
-              this.$router.push({path:"/good/order/add?id="+id+"&ids="+str})
+               //修改订购单
+               is_warehouse = 3
+               this.ModefySupplyWarehousing(is_warehouse,warehousing_id)
             }
           }
         }

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -204,8 +204,6 @@
 
         <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
 
-      
-
     </div>
 </div>
 
@@ -377,7 +375,7 @@ changeGoodName(val){
   this.currentIndex = val
 },
 changeName(val){
-    //var obj = {"id":0,"name":"合计","supply_name":"","supply_type":"","supply_specification_name":"","supply_total":"","supply_count":"","supply_price":"","supply_total_price":"","supply_manufacturer":"","supply_license_number":"","supply_remake":"","is_total":2}
+   
    for(let i=0;i<this.recordInfo.tableList.length;i++){
     if(this.currentIndex == i){
         this.recordInfo.tableList[i].project_id = val.id

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -90,7 +90,7 @@
               <span>{{getName(scope.row.supplier_id)}}</span>
             </template>
          </el-table-column>
-        <el-table-column label="关联购货订单" align="center">
+        <el-table-column label="关联购货单号" align="center">
           <template slot-scope="scope">
             <div style="width:100%;height:100%">
               <tr class="annotation-rs cluster-rs" v-for="(item,index) in scope.row.orderOut" :key="index">
@@ -99,7 +99,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="购物金额" align="center">
+        <el-table-column label="购货金额" align="center">
           <template slot-scope="scope">
              <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span> 
           </template>
@@ -303,13 +303,19 @@ export default {
        return buy_price.toFixed(2)
      },
      getAllCount(arr){
-       var count = ""
+       var count = 0
         if(arr!=undefined && arr.length > 0){
           for(let i=0;i<arr.length;i++){
-            count += arr[i].count
+            count += parseInt(arr[i].count)
           }
        }
-       return count
+       if(count == 0){
+         return ""
+       }
+       if(count > 0){
+         return count
+       }
+      
      },
      toClick(id){
        this.$router.push({path:"/purchase/order/edit?id="+id})

src/xt_pages/supply/supplyQuery.vue

@@ -163,7 +163,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import addSupply from "./components/addSupply.vue"
-import {getSupplierId} from "@/api/supply"
+// import {getSupplierId} from "@/api/supply"
 export default {
   name: "stockIn",
   created() {