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

src/api/supply.js

     params: params
   })
 }
+
+export function ModefySupplyWarehousing(params) {
+  return request({
+    url: '/api/supply/modefysupplywarehousing',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

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

src/xt_pages/outpatientCharges/components/chargeDialog.vue

         <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
 
+      <el-form-item label="个账支出：" prop="age" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.acc_pay" :disabled="true"></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="个人现金支出：" prop="age" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.psn_pay" :disabled="true"></el-input>
+      </el-form-item>
+
+
 
       <el-form-item label="支付方式：" style="width:100%;">
         <!-- <el-select v-model="form.pay_way" placeholder="请选择">
           total:0,
           fapiao_code:"",
           fapiao_number:"",
-          order:null
+          order:null,
+          acct_pay:'',
+          psn_pay:'',
+
 
 
         },
           reality_price:'',
           found_price:'',
           fapiao_code:"",
-          fapiao_number:""
+          fapiao_number:"",
+          acct_pay:"",
+          psn_pay:"",
         },
 
       }
         this.form.discount_price = 0.0
         this.form.preferential_price = 0.0
 
+
+
         this.form.fapiao_code =""
         this.form.fapiao_number = ""
         this.order = order
 
         if(this.order && this.order.id > 0){
+          this.form.acct_pay = this.order.acct_pay
+          this.form.psn_pay = this.order.psn_cash_pay
           this.form.total = this.order.medfee_sumamt
           this.form.pay_price = this.order.medfee_sumamt
           this.form.medical_insurance_price = this.order.fund_pay_sumamt

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

     }, methods:  {
 
       getName(id){
-        console.log("!!!!!!!!!")
-
         let  name = ""
         for(let i = 0; i  < this.manufacturers.length; i++){
-          console.log(this.manufacturers[i].manufacturer_name)
           if(id == this.manufacturers[i].id){
-            console.log("!!!!!!!!!")
             name =  this.manufacturers[i].manufacturer_name
           }
         }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

             :editable="false"
             style="width: 100%;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择开始时间"
             align="right"
             format="yyyy-MM-dd"
                             value-format="yyyy-MM-dd HH:mm:ss">
                         </el-date-picker>
                       </el-form-item>
-
-
                     </el-form>
-
                   </div>
-
                   <p class="centerRightTitle">人员信息</p>
                   <div style="display:flex;justify-content: space-between;line-height:30px;">
                     <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
                     <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>
                     <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
                     <li style="width:50%;">电话：{{ patientInfo.phone }}</li>
-
-
                   </ul>
                   <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
                   <div style="display:flex;justify-content: space-between;line-height:30px;">
                     <li style="width:50%;">医生：{{ info.doctor }}</li>
                     <li style="width:50%;">科室：{{ info.departments }}</li>
                     <!--<li style="width:100%;">总费用：{{ getTotal() }}</li>-->
-
                     <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>
                     <li style="width:100%;">是否有传染病：</li>
                     <li style="width:100%;">血压：</li>
       register: [
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
+        { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
+        { value: '1112', label: '精二' },
         { value: '1112', label: '精二' }
+
       ],
 
       registerThree: [
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
+        { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
         { value: '9933', label: '门诊特殊病(9933)' },
       register_two: [
         { value: '11', label: '普通门诊' },
         { value: '14', label: '门诊特殊病' },
+        { value: '9922', label: '家庭通道' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' }
           break
         case 1112:
           return '精二' + '处方' + index
+          break
         case 9933:
           return '门诊特殊病(9933)' + '处方' + index
+          break
         case 990602:
           return '门诊特殊病(990602)' + '处方' + index
+          break
         case 1402:
           return '门诊特殊病(1402)' + '处方' + index
           break
+        case 9922:
+          return '家庭通道' + '处方' + index
+          break
       }
     }, unique_four(array) {
       // res用来存储结果

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

           { value: 11, label: '普通门诊' },
           { value: 14, label: '门诊特殊病' },
           { value: 1111, label: '精一' },
-          { value: 1112, label: '精二' }
+          { value: 1112, label: '精二' },
+          { value: 9922, label: '家庭通道' },
+
 
 
         ],
           return false
         }
       }, open_three() {
-        console.log(this.prescriptions)
         for (let i = 0; i < this.prescriptions.length; i++) {
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
             if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {

src/xt_pages/supply/components/addGoodOrder.vue

         </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>
 data() {
 return {
     crumbs: [
-       { path: false, name: "购货单" },
-       { path: "/spply/query", name: "新增购货单" }
+       { path: false, name: "采购单" },
+       { path: "/supply/good/order/query", name: "新增采购单" }
     ],
     showTwo:true,
     showOne:false,
     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' }],
         this.supplyList = response.data.data.supplyList
        for(let i=0;i<drugList.length;i++){
           for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
-            drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+            if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+            }
           }
         for(let j=0;j<this.manufactuerList.length;j++){
             if(drugList[i].manufacturer == this.manufactuerList[j].id){
         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])
         }
         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 
     var min_str = ""
     if (arr.length > 0) {
       for(let i=0;i<arr.length;i++){
-        total += parseInt(arr[i].stock_max_number)
+        total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number)
       }
     }
     if (total < min_number){
            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
+                  }
                 }
              }  
             } 
              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
             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
+                    }
                   }
               }  
               } 
 
         }
     }
-    var start = this.getTimes(this.start_time)
+    var start = this.start_time
     this.$refs["tableForm"].validate((valid)=>{
         if(valid){
            this.loading = true
     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

 
    
 
-    <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>
 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,
     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' }],
     getInitOrder().then(response=>{
     if(response.data.state == 1){
         var drugList = response.data.data.drugList
-        
+        console.log("druglist23232232323232332",drugList)
         this.manufactuerList = response.data.data.manufactuerList
         this.goodTypeList = response.data.data.goodTypeList
         this.drugTypeList = response.data.data.drugTypeList
         this.supplyList = response.data.data.supplyList
        for(let i=0;i<drugList.length;i++){
-          
           for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
-            drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+            if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+            }
+           
           }
         for(let j=0;j<this.manufactuerList.length;j++){
             if(drugList[i].manufacturer == this.manufactuerList[j].id){
         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])
         }
         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 
         }
 
             }
         }
-        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
         }
                 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
+                         }
                        }
                     }  
                    } 
                 }
                 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
             }
 
 },
 getWarehoseInfo(arr,max_unit,min_unit,min_number){
+    console.log("arr2332233232",arr)
     var total = 0
     var max_str=  ""
     var min_str = ""
     if (arr.length > 0) {
       for(let i=0;i<arr.length;i++){
-        total += parseInt(arr[i].stock_max_number)
+        total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number)
       }
     }
     if (total < min_number){
               }
            }
         }
-        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
         }
     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

         </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>
 <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: {
 data() {
 return {
     crumbs: [
-       { path: false, name: "购货单" },
-       { path: "/spply/query", name: "编辑购货单" }
+       { path: false, name: "采购单" },
+       { path: "/supply/good/order/query", name: "编辑采购单" }
     ],
     showTwo:true,
     showOne:false,
     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' }],
         this.supplyList = response.data.data.supplyList
        for(let i=0;i<drugList.length;i++){
           for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
-            drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+             if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+            }
           }
         for(let j=0;j<this.manufactuerList.length;j++){
             if(drugList[i].manufacturer == this.manufactuerList[j].id){
         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])
         }
         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
     var min_str = ""
     if (arr.length > 0) {
       for(let i=0;i<arr.length;i++){
-        total += parseInt(arr[i].stock_max_number)
+        total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number)
       }
     }
     if (total < min_number){
         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
            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
+                  }
+                
                 }
              }  
             } 
 
         }
     }
-    var start = this.getTimes(this.start_time)
+    var start = this.start_time
     this.$refs["tableForm"].validate((valid)=>{
         if(valid){
            this.loading = true
         }
       }
     })
+  },
+  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(){
     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

     <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"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         @change="startTimeChange"
+        :disabled="disabled"
         ></el-date-picker>
         <span>交货日期:</span>
         <el-date-picker
             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>
         </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>
 
     <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"
 
     <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>
  
       合计:{{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>
   :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">
 data() {
 return {
     crumbs: [
-       { path: false, name: "购货订单" },
-       { path: "/spply/query", name: "编辑购货订单" }
+       { path: false, name: "采购订单" },
+       { path: "/supply/query", name: "编辑采购订单" }
     ],
     showTwo:true,
     showOne:false,
     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' }],
         this.supplyList = response.data.data.supplyList
        for(let i=0;i<drugList.length;i++){
           for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
-            drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+            if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+            }
           }
         for(let j=0;j<this.manufactuerList.length;j++){
             if(drugList[i].manufacturer == this.manufactuerList[j].id){
         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])
         }
         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 
     var min_str = ""
     if (arr.length > 0) {
       for(let i=0;i<arr.length;i++){
-        total += parseInt(arr[i].stock_max_number)
+        total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number)
       }
     }
     if (total < min_number){
               }
            }
         }
-        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
         }
         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
            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

               <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>
     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: [],
     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

               <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">
             </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>
     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: [],
       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 
     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

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