11月14日 库存扣减更新

src/api/supply.js

@@ -135,3 +135,11 @@ export function getGoodOrderCountList(id, warehousing_id, params) {
     params: params
   })
 }
+
+export function ModefySupplyWarehousing(params) {
+  return request({
+    url: '/api/supply/modefysupplywarehousing',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -137,10 +137,10 @@ export default {
     addStockIn: '入库',
     stockQuery: '库存查询',
     supplyQuery: '供应商管理',
-    purchaseOrderQuery: '购货订单',
-    goodOrderQuery: '购货单',
-    goodReturnQuery:'退货单',
-    addPurchaseOrder: '新增购货订单',
+    purchaseOrderQuery: '采购订单',
+    goodOrderQuery: '采购单',
+    goodReturnQuery: '退货单',
+    addPurchaseOrder: '新增采购订单',
     workforce_template: '排班模板设置',
     statistics: '统计分析',
     statisticalConfig: '统计配置',

src/xt_pages/supply/components/addGoodOrder.vue

@@ -156,13 +156,13 @@
         </template>
     </el-table-column>
 
-    <el-table-column label="购货单价" align="center" width="120px">
+    <el-table-column label="采购单价" align="center" width="120px">
         <template slot-scope="scope">
         <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
-    <el-table-column label="购货金额" align="center" width="120px">
+    <el-table-column label="采购金额" align="center" width="120px">
         <template slot-scope="scope">
           {{calculate(scope.row.supply_count * scope.row.supply_price)}}
         </template>
@@ -276,8 +276,8 @@ BreadCrumb
 data() {
 return {
     crumbs: [
-       { path: false, name: "购货单" },
-       { path: "/spply/query", name: "新增购货单" }
+       { path: false, name: "采购单" },
+       { path: "/supply/good/order/query", name: "新增采购单" }
     ],
     showTwo:true,
     showOne:false,
@@ -309,8 +309,8 @@ return {
     supplyList:[],
     rate_of_concession:"",
     discount_amount:"",
-    start_time:new Date(),
-    end_time:new Date(),
+    start_time:"",
+    end_time:"",
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
@@ -372,11 +372,22 @@ getInitOrder(){
         drugList[i].type = 1
         drugList[i].supply_price = drugList[i].last_price
         drugList[i].name = drugList[i].drug_name
-        drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        if(drugList[i].max_unit != drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        }
+        if(drugList[i].max_unit == drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""}]
+        }
+       
         drugList[i].supply_unit = drugList[i].max_unit 
         for(let j=0;j<drugList[i].unitList.length;j++){
-           drugList[i].unitList[0].name = drugList[i].max_unit
-           drugList[i].unitList[1].name = drugList[i].min_unit
+          if(drugList[i].max_unit != drugList[i].min_unit){
+            drugList[i].unitList[0].name = drugList[i].max_unit
+            drugList[i].unitList[1].name = drugList[i].min_unit
+          }
+           if(drugList[i].max_unit == drugList[i].min_unit){
+             drugList[i].unitList[0].name = drugList[i].max_unit
+           }
         }
         this.tabList.push(drugList[i])
         }
@@ -405,7 +416,7 @@ getInitOrder(){
         goodList[i].supply_remake = ""
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
-        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        goodList[i].unitList =  [{id:1,name:""}]
         goodList[i].supply_unit = goodList[i].packing_unit
         for(let j=0;j<goodList[i].unitList.length;j++){
            goodList[i].unitList[0].name = goodList[i].packing_unit 
@@ -605,9 +616,15 @@ getTimes(time) {
            if(orderInfo[i].is_source == 1){
             for(let j=0;j<drugList.length;j++){
                 if( orderInfo[i].project_id == drugList[j].id){
-                  orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                  orderInfo[i].unitList[0].name = drugList[j].max_unit
-                  orderInfo[i].unitList[1].name = drugList[j].min_unit
+                  if(drugList[j].max_unit!=drugList[j].min_unit){
+                    orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit
+                    orderInfo[i].unitList[1].name = drugList[j].min_unit
+                  }
+                  if(drugList[j].max_unit == drugList[j].min_unit){
+                    orderInfo[i].unitList = [{id:1,name:""}]
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit
+                  }
                 }
              }  
             } 
@@ -685,7 +702,7 @@ getTimes(time) {
              this.payment =warehouseOut.payment
              this.arrearage =warehouseOut.arrearage
              this.supplier_name = warehouseOut.supplier_id
-            
+             this.start_time = this.getTimes(warehouseOut.document_date)
             for(let i=0;i< orderInfo.length;i++){
               orderInfo[i].supply_count =  orderInfo[i].count
               orderInfo[i].supply_price =  orderInfo[i].price
@@ -700,9 +717,14 @@ getTimes(time) {
             if(orderInfo[i].is_source == 1){
               for(let j=0;j<this.drugList.length;j++){
                   if( orderInfo[i].project_id == this.drugList[j].id){
-                    orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                    orderInfo[i].unitList[0].name = this.drugList[j].max_unit
-                    orderInfo[i].unitList[1].name = this.drugList[j].min_unit
+                    if(this.drugList[j].max_unit !=this.drugList[j].min_unit){
+                      orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                      orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                      orderInfo[i].unitList[1].name = this.drugList[j].min_unit
+                    }
+                    if(this.drugList[j].max_unit ==this.drugList[j].min_unit){
+                      orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                    }
                   }
               }  
               } 
@@ -753,7 +775,7 @@ getTimes(time) {
 
         }
     }
-    var start = this.getTimes(this.start_time)
+    var start = this.start_time
     this.$refs["tableForm"].validate((valid)=>{
         if(valid){
            this.loading = true
@@ -802,7 +824,8 @@ created(){
     if(parseInt(this.$route.query.id) > 0){
       this.getPurchaseOrderDetail()
     }
-  
+    this.start_time = this.getTimes(new Date())
+    this.end_time = this.getTimes(new Date())
 }
 };
 </script>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -130,13 +130,13 @@
 
    
 
-    <el-table-column label="购货单价" align="center" width="120px">
+    <el-table-column label="采购单价" align="center" width="120px">
         <template slot-scope="scope">
         <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
-    <el-table-column label="购货金额" align="center" width="120px">
+    <el-table-column label="采购金额" align="center" width="120px">
         <template slot-scope="scope">
           {{calculate(scope.row.supply_count * scope.row.supply_price)}}
         </template>
@@ -212,29 +212,15 @@ import {getInitOrder,savePurchaseOrder,updatePurchaseOrder,checkPurchaseOrder} f
 import {getDataConfig } from '@/utils/data'
 export default {
 name: "addPurchaseOrder",
-created() {
-this.org_id =  this.$store.getters.xt_user.org_id
 
-var start_time =  window.sessionStorage.getItem('start_time')
-var end_time =  window.sessionStorage.getItem('end_time')
-
-if(start_time !=null){
-    this.start_time = start_time
-}
-if(end_time!=null){
-    this.end_time = end_time
-}
-window.sessionStorage.removeItem('start_time')
-window.sessionStorage.removeItem('end_time')
-},
 components: {
 BreadCrumb
 },
 data() {
 return {
     crumbs: [
-       { path: false, name: "购货订单" },
-       { path: "/spply/query", name: "新增购货订单" }
+       { path: false, name: "采购订单" },
+       { path: "/supply/query", name: "新增采购订单" }
     ],
     showTwo:true,
     showOne:false,
@@ -266,8 +252,8 @@ return {
     supplyList:[],
     rate_of_concession:"",
     discount_amount:"",
-    start_time:new Date(),
-    end_time:new Date(),
+    start_time:"",
+    end_time:"",
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
@@ -329,10 +315,22 @@ getInitOrder(){
         drugList[i].supply_price = drugList[i].last_price
         drugList[i].name = drugList[i].drug_name
         drugList[i].supply_unit = drugList[i].max_unit
-        drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        if(drugList[i].max_unit!=drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        }
+        if(drugList[i].max_unit ==drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""}]
+        }
+       
         for(let j=0;j<drugList[i].unitList.length;j++){
-           drugList[i].unitList[0].name = drugList[i].max_unit
-           drugList[i].unitList[1].name = drugList[i].min_unit
+           if(drugList[i].max_unit!=drugList[i].min_unit){
+             drugList[i].unitList[0].name = drugList[i].max_unit
+             drugList[i].unitList[1].name = drugList[i].min_unit
+           }
+           if(drugList[i].max_unit ==drugList[i].min_unit){
+             drugList[i].unitList[0].name = drugList[i].max_unit
+           }
+          
         }
         this.tabList.push(drugList[i])
         }
@@ -364,7 +362,7 @@ getInitOrder(){
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
         goodList[i].supply_unit = goodList[i].packing_unit
-        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        goodList[i].unitList =  [{id:1,name:""}]
         for(let j=0;j<goodList[i].unitList.length;j++){
            goodList[i].unitList[0].name = goodList[i].packing_unit 
         }
@@ -461,8 +459,8 @@ savePurchaseOrder(){
 
             }
         }
-        var start = this.getTimes(this.start_time)
-        var end = this.getTimes(this.end_time)
+        var start = this.start_time
+        var end = this.end_time
         const params = {
             'stockIn': this.recordInfo.tableList
         }
@@ -476,15 +474,26 @@ savePurchaseOrder(){
                 var warehouseInfo = response.data.data.warehouseInfo
                 this.number  = warehouseInfo.number
                 this.id = warehouseInfo.id
+                this.supplier_name = warehouseInfo.supplier_id
+                this.rate_of_concession = warehouseInfo.rate_of_concession
+                this.discount_amount = warehouseInfo.discount_amount
+                this.start_time = this.getTimes(warehouseInfo.document_date)
+                this.end_time = this.getTimes(warehouseInfo.delivery_date)
                 this.recordInfo.tableList = []
                 var orderInfo = response.data.data.orderInfo
                 for(let i=0;i<orderInfo.length;i++){
                    if(orderInfo[i].is_source == 1){
                     for(let j=0;j<this.drugList.length;j++){
                        if(orderInfo[i].project_id == this.drugList[j].id){
-                          orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                          orderInfo[i].unitList[0].name = this.drugList[j].max_unit
-                          orderInfo[i].unitList[1].name = this.drugList[j].min_unit
+                         if(this.drugList[j].max_unit !=this.drugList[j].min_unit){
+                            orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                            orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                            orderInfo[i].unitList[1].name = this.drugList[j].min_unit
+                         }
+                         if(this.drugList[j].max_unit ==this.drugList[j].min_unit){
+                            orderInfo[i].unitList = [{id:1,name:""}]
+                            orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                         }
                        }
                     }  
                    } 
@@ -505,25 +514,7 @@ savePurchaseOrder(){
                 }
                 console.log("orderINFO23323232",orderInfo)
                 this.recordInfo.tableList = orderInfo
-                // for(let i=0;i<orderInfo.length;i++){
-                //    orderInfo[i].name = "" 
-                //    orderInfo[i].supply_name = ""
-                //    orderInfo[i].supply_specification_name = ""
-                //   if(orderInfo[i].is_source == 1){
-                //     for(let j=0;j<this.drugList.length;j++){
-                //        if(orderInfo[i].project_id == this.drugList[j].id){
-                //           orderInfo[i].name = this.drugList[j].drug_name
-                //        }
-                //     }
-                //   }
-                //   if(orderInfo[i].is_source == 2){
-                //     for(let y=0;y<this.goodList.length;y++){
-                //        if(orderInfo[i].project_id = this.goodList[y].id){
-                //           orderInfo[i].name = this.goodList[y].good_name
-                //        }
-                //     }
-                //   }
-                // }
+                
                 this.showTwo = false
                 this.showOne = true
             }
@@ -603,8 +594,8 @@ getTimes(time) {
               }
            }
         }
-        var start = this.getTimes(this.start_time)
-        var end = this.getTimes(this.end_time)
+        var start = this.start_time
+        var end =   this.end_time
         const params = {
         'stockIn': this.recordInfo.tableList
         }
@@ -686,6 +677,8 @@ created(){
     tempObj["supply_unit"] = ""
     this.recordInfo.tableList.push(tempObj)
     this.getInitOrder()
+    this.start_time = this.getTimes(new Date())
+    this.end_time = this.getTimes(new Date())
 }
 };
 </script>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -155,13 +155,13 @@
         </template>
     </el-table-column>
 
-    <el-table-column label="购货单价" align="center" width="120px">
+    <el-table-column label="采购单价" align="center" width="120px">
         <template slot-scope="scope">
         <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
-    <el-table-column label="购货金额" align="center" width="120px">
+    <el-table-column label="采购金额" align="center" width="120px">
         <template slot-scope="scope">
           {{calculate(scope.row.supply_count * scope.row.supply_price)}}
         </template>
@@ -266,7 +266,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
-import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList} from "@/api/supply"
+import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList,ModefySupplyWarehousing} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
@@ -275,8 +275,8 @@ BreadCrumb
 data() {
 return {
     crumbs: [
-       { path: false, name: "购货单" },
-       { path: "/spply/query", name: "编辑购货单" }
+       { path: false, name: "采购单" },
+       { path: "/supply/good/order/query", name: "编辑采购单" }
     ],
     showTwo:true,
     showOne:false,
@@ -308,8 +308,8 @@ return {
     supplyList:[],
     rate_of_concession:"",
     discount_amount:"",
-    start_time:new Date(),
-    end_time:new Date(),
+    start_time:"",
+    end_time:"",
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
@@ -371,13 +371,24 @@ getInitOrder(){
         drugList[i].type = 1
         drugList[i].supply_price = drugList[i].last_price
         drugList[i].name = drugList[i].drug_name
-        drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        if(drugList[i].max_unit != drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        }
+        if(drugList[i].max_unit == drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""}]
+        }
+       
         drugList[i].warehouse_info_id = 0
         drugList[i].warehousing_id= 0
         drugList[i].supply_unit = drugList[i].max_unit 
         for(let j=0;j<drugList[i].unitList.length;j++){
-           drugList[i].unitList[0].name = drugList[i].max_unit
-           drugList[i].unitList[1].name = drugList[i].min_unit
+          if(drugList[i].max_unit != drugList[i].min_unit){
+            drugList[i].unitList[0].name = drugList[i].max_unit
+            drugList[i].unitList[1].name = drugList[i].min_unit
+          }
+          if(drugList[i].max_unit  == drugList[i].min_unit){
+            drugList[i].unitList[0].name = drugList[i].max_unit
+          }
         }
         this.tabList.push(drugList[i])
         }
@@ -406,7 +417,7 @@ getInitOrder(){
         goodList[i].supply_remake = ""
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
-        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        goodList[i].unitList =  [{id:1,name:""}]
         goodList[i].supply_unit = goodList[i].packing_unit
         goodList[i].warehouse_info_id = 0
         goodList[i].warehousing_id= 0
@@ -593,6 +604,7 @@ getTimes(time) {
         this.arrearage = out.arrearage
         this.number = out.number
         this.good_number = out.good_number
+        this.start_time = this.getTimes(out.document_date)
         var orderInfo = response.data.data.list
         
         var drugList = response.data.data.drugList
@@ -612,9 +624,16 @@ getTimes(time) {
            if(orderInfo[i].is_source == 1){
             for(let j=0;j<drugList.length;j++){
                 if( orderInfo[i].project_id == drugList[j].id){
-                  orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                  orderInfo[i].unitList[0].name = drugList[j].max_unit
-                  orderInfo[i].unitList[1].name = drugList[j].min_unit
+                  if(drugList[j].max_unit!=drugList[j].min_unit){
+                    orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit
+                    orderInfo[i].unitList[1].name = drugList[j].min_unit
+                  }
+                  if(drugList[j].max_unit ==drugList[j].min_unit){
+                    orderInfo[i].unitList = [{id:1,name:""}]
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit
+                  }
+                
                 }
              }  
             } 
@@ -669,7 +688,7 @@ getTimes(time) {
 
         }
     }
-    var start = this.getTimes(this.start_time)
+    var start = this.start_time
     this.$refs["tableForm"].validate((valid)=>{
         if(valid){
            this.loading = true
@@ -785,6 +804,17 @@ getTimes(time) {
         }
       }
     })
+  },
+  ModefySupplyWarehousing(is_warehouse,warehousing_id){
+     var params = {
+       is_warehouse:is_warehouse,
+       warehousing_id:warehousing_id,
+     }
+    ModefySupplyWarehousing(params).then(response=>{
+      if(response.data.state == 1){
+        var msg = response.data.data.msg
+      }
+    })
   }
 },
 created(){
@@ -817,7 +847,8 @@ created(){
     if(parseInt(this.$route.query.id) > 0){
       this.getGoodOrderDetail()
     }
-  
+    this.start_time = this.getTimes(new Date())
+    this.end_time = this.getTimes(new Date())
 }
 };
 </script>

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -8,7 +8,7 @@
     <div>
         <span style="color:red">*</span><span>供应商:</span>
         <el-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择"
-        @change="changeTypeName">
+        @change="changeTypeName" :disabled="disabled">
         <el-option
             v-for="item in supplyList"
             :key="item.id"
@@ -29,6 +29,7 @@
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         @change="startTimeChange"
+        :disabled="disabled"
         ></el-date-picker>
         <span>交货日期:</span>
         <el-date-picker
@@ -43,12 +44,13 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="endTimeChange"
+            :disabled="disabled"
         ></el-date-picker>
         <span>单据编码:{{number}}</span>
 
     </div>
     <div>
-        <el-button size="small" type="primary" @click="toAdd" v-show="showOne">生成购货单</el-button>
+        <el-button size="small" type="primary" @click="toAdd" v-show="showOne">生成采购单</el-button>
         <el-button size="small" type="primary" @click="updatePurchaseOrder">修改</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder" v-show="showTwo">审核</el-button>
@@ -135,13 +137,13 @@
         </template>
     </el-table-column>
 
-    <el-table-column label="购货单价" align="center" width="120px">
+    <el-table-column label="采购单价" align="center" width="120px">
         <template slot-scope="scope">
         <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
-    <el-table-column label="购货金额" align="center" width="120px">
+    <el-table-column label="采购金额" align="center" width="120px">
         <template slot-scope="scope">
           {{calculate(scope.row.supply_count * scope.row.supply_price)}}
         </template>
@@ -149,7 +151,7 @@
 
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-           <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂商" :disabled="disabled">
+           <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"
@@ -163,7 +165,7 @@
 
     <el-table-column label="批准文号" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="disabled"></el-input>
+        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="true"></el-input>
         </template>
     </el-table-column>
  
@@ -200,9 +202,9 @@
       合计:{{getAllPrice()}} 元
    </div>
    <div style="margin-top:10px">
-        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession" @input='addressChange'></el-input>%</span>
+        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession" @input='addressChange' :disabled="disabled"></el-input>%</span>
 
-        <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+        <span>优惠金额:<el-input style="width:100px" v-model="discount_amount" :disabled="disabled"></el-input></span>
 
     </div>
 </div>
@@ -212,9 +214,9 @@
   :visible.sync="dialogVisible"
   width="30%">
   <span>
-    购货订单{{number}}已有以下关联数据,不能反审核
+    采购订单{{number}}已有以下关联数据,不能反审核
     <div v-for="(item,index) in orderList" :key="index">
-        <li>购货单{{item.good_number}}</li> <a @click="toClick(item.id)">点击查看</a>
+        <li>采购单{{item.good_number}}</li> <a @click="toClick(item.id)">点击查看</a>
     </div>
   </span>
   <span slot="footer" class="dialog-footer">
@@ -236,8 +238,8 @@ BreadCrumb
 data() {
 return {
     crumbs: [
-       { path: false, name: "购货订单" },
-       { path: "/spply/query", name: "编辑购货订单" }
+       { path: false, name: "采购订单" },
+       { path: "/supply/query", name: "编辑采购订单" }
     ],
     showTwo:true,
     showOne:false,
@@ -269,8 +271,6 @@ return {
     supplyList:[],
     rate_of_concession:"",
     discount_amount:"",
-    start_time:new Date(),
-    end_time:new Date(),
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
@@ -327,11 +327,23 @@ getInitOrder(){
         drugList[i].type = 1
         drugList[i].supply_price = drugList[i].last_price
         drugList[i].name = drugList[i].drug_name
-        drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        if(drugList[i].max_unit!=drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        }
+        if(drugList[i].max_unit == drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""}]
+        }
+      
         drugList[i].supply_unit = drugList[i].max_unit 
         for(let j=0;j<drugList[i].unitList.length;j++){
-           drugList[i].unitList[0].name = drugList[i].max_unit
-           drugList[i].unitList[1].name = drugList[i].min_unit
+          if(drugList[i].max_unit!=drugList[i].min_unit){
+            drugList[i].unitList[0].name = drugList[i].max_unit
+            drugList[i].unitList[1].name = drugList[i].min_unit
+          }
+          if(drugList[i].max_unit ==drugList[i].min_unit){
+            drugList[i].unitList[0].name = drugList[i].max_unit
+          }
+         
         }
         this.tabList.push(drugList[i])
         }
@@ -360,7 +372,7 @@ getInitOrder(){
         goodList[i].supply_remake = ""
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
-        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        goodList[i].unitList =  [{id:1,name:""}]
         goodList[i].supply_unit = goodList[i].packing_unit
         for(let j=0;j<goodList[i].unitList.length;j++){
            goodList[i].unitList[0].name = goodList[i].packing_unit 
@@ -523,8 +535,8 @@ getTimes(time) {
               }
            }
         }
-        var start = this.getTimes(this.start_time)
-        var end = this.getTimes(this.end_time)
+        var start = this.start_time
+        var end = this.end_time
         const params = {
         'stockIn': this.recordInfo.tableList
         }
@@ -580,7 +592,10 @@ getTimes(time) {
         this.supplier_name = info.supplier_id
         this.rate_of_concession = info.rate_of_concession
         this.discount_amount = info.discount_amount
+        this.start_time = this.getTimes(info.document_date)
+        this.end_time = this.getTimes(info.delivery_date)
         var orderInfo = response.data.data.orderInfo
+
         if(info.is_check == 2){
            this.disabled = false
            this.showOne = false
@@ -606,9 +621,16 @@ getTimes(time) {
            if(orderInfo[i].is_source == 1){
             for(let j=0;j<drugList.length;j++){
                 if(orderInfo[i].project_id == drugList[j].id){
-                  orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                  orderInfo[i].unitList[0].name = drugList[j].max_unit
-                  orderInfo[i].unitList[1].name = drugList[j].min_unit
+                  if(drugList[j].max_unit != drugList[j].min_unit){
+                    orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit
+                    orderInfo[i].unitList[1].name = drugList[j].min_unit
+                  }
+                  if(drugList[j].max_unit  == drugList[j].min_unit){
+                    orderInfo[i].unitList = [{id:1,name:""}]
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit
+                  }
+                 
                 }
              }  
             } 

src/xt_pages/supply/goodOrderQuery.vue

@@ -90,12 +90,12 @@
               <span>{{getName(scope.row.supplier_id)}}</span>
             </template>
          </el-table-column>
-        <el-table-column label="关联购货订单号" align="center" width="200">
+        <el-table-column label="关联采购订单号" align="center" width="200">
           <template slot-scope="scope">
             <span>{{scope.row.number}}</span>
           </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.orderOut)>0">{{getAllBuyPrice(scope.row.orderOut)}}</span> 
           </template>
@@ -189,14 +189,14 @@ export default {
     return {
       crumbs: [
         { path: false, name: "采购管理" },
-        { path: "/spply/query", name: "购货单" }
+        { path: "/supply/good/order/query", name: "采购单" }
       ],
       keywords: "",
       total: 0,
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       start_time: "",
-      end_time:new Date(),
+      end_time:"",
       page: 1,
       limit: 10,
       goodType: [],
@@ -326,7 +326,8 @@ export default {
     var nowYear = now.getFullYear(); //当前年 
     //本月的开始时间
     var monthStartDate = new Date(nowYear, nowMonth, 1); 
-    this.start_time = monthStartDate
+    this.start_time =  this.getTimes(monthStartDate)
+    this.end_time = this.getTimes(new Date())
     this.org_id =  this.$store.getters.xt_user.org_id
     this.getAllSupply()
     this.getlist()

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>
@@ -190,14 +190,14 @@ export default {
     return {
       crumbs: [
         { path: false, name: "采购管理" },
-        { path: "/spply/query", name: "购货订单" }
+        { path: "/supply/query", name: "采购订单" }
       ],
       keywords: "",
       total: 0,
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       start_time: "",
-      end_time:new Date(),
+      end_time:"",
       page: 1,
       limit: 10,
       goodType: [],
@@ -258,14 +258,16 @@ export default {
       return uParseTime(time, '{y}-{m}-{d}')
      },
      getlist(){
+        console.log("hhhhhh",this.end_time)
         var params = {
           check_id:this.check_id,
-          start_time:this.getTimes(this.start_time),
-          end_time:this.getTimes(this.end_time),
+          start_time:this.start_time,
+          end_time:this.end_time,
           keyword:this.keywords,
           page:this.page,
           limit:this.limit,
         }
+       console.log("params2332232332",params)
        getAllPurchaseOrderList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list 
@@ -355,7 +357,8 @@ export default {
     var nowYear = now.getFullYear(); //当前年 
     //本月的开始时间
     var monthStartDate = new Date(nowYear, nowMonth, 1); 
-    this.start_time = monthStartDate
+    this.start_time = this.getTimes(monthStartDate) 
+    this.end_time = this.getTimes(new Date())
     this.org_id =  this.$store.getters.xt_user.org_id
     this.getAllSupply()
     this.getlist()

src/xt_pages/supply/supplyQuery.vue

@@ -191,7 +191,7 @@ export default {
       type_name:"",
       crumbs: [
         { path: false, name: "采购管理" },
-        { path: "/spply/query", name: "供应商管理" }
+        { path: "/supply/good/order/query", name: "供应商管理" }
       ],
       keywords: "",
       total: 0,