11月14日 库存扣减更新

src/api/supply.js

@@ -55,3 +55,59 @@ export function getPurchaseOrderDetail(id, params) {
     params: params
   })
 }
+
+export function addGoodOrder(data, supplier_name, start, arrearage, payment, warehousing_id, number, rate_of_concession, discount_amount) {
+  return request({
+    url: '/api/supply/addgoodorder?supplier_id=' + supplier_name + '&start=' + start + '&arrerage=' + arrearage + '&payment=' + payment + '&warehousing_id=' + warehousing_id + '&number=' + number + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount,
+    method: 'post',
+    data: data
+  })
+}
+
+export function getAllGoodOrderList(params) {
+  return request({
+    url: '/api/supply/getallgoodorderlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodOrderDetail(id, params) {
+  return request({
+    url: '/api/supply/getgoodorderdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateGoodOrder(data, supplier_name, start, arrearage, payment, warehose_out_id, number, rate_of_concession, discount_amount, good_number) {
+  return request({
+    url: '/api/supply/updategoodorder?supplier_id=' + supplier_name + '&start=' + start + '&arrerage=' + arrearage + '&payment=' + payment + '&warehose_out_id=' + warehose_out_id + '&number=' + number + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&good_number=' + good_number,
+    method: 'post',
+    data: data
+  })
+}
+
+export function deletePurchaseOrder(id, params) {
+  return request({
+    url: '/api/supply/deletepurchorder?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getAllOrderCountList(id, params) {
+  return request({
+    url: '/api/supply/getallordercountlist?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getPurchaseOrderInfo(id, ids, params) {
+  return request({
+    url: '/api/supply/getpurchaseorderinfo?id=' + id + '&ids=' + ids,
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/supply.js

@@ -75,6 +75,15 @@ export default {
       hidden: true,
       is_menu: false,
       isChild: true
+    },
+    {
+      path: '/good/order/edit',
+      component: () => import('@/xt_pages/supply/components/editGoodOrder'),
+      name: 'editGoodOrder',
+      meta: { title: 'editGoodOrder', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
     }
 
   ]

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -316,6 +316,10 @@
           <label>机器运行: </label>
           <span class="content" >{{ this.record.machine_run}}</span>
         </li>
+        <li v-if="isShow('透后尿素')">
+          <label>透后尿素(mmol/L): </label>
+          <span class="content" >{{ this.record.after_urea}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -370,6 +370,12 @@
           <span class="content">{{this.record.blood_pressure_during_dialysis}}</span>
           <span class="unit"></span>
         </li>
+
+        <li v-if="isShow('透前尿素')">
+          <label>透前尿素(mmol/L): </label>
+          <span class="content">{{this.record.urea_befor}}</span>
+          <span class="unit"></span>
+        </li>
        
       </ul>
     </div>

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -440,73 +440,7 @@
           </el-form-item>
         </el-col>
 
-        <!-- </el-row>
-
-        <el-row :gutter="20"> -->
-
-        <!-- </el-row>
-
-        <el-row :gutter="20"> -->
-
-        <!--          <el-col :span="8" v-if="isShow('血管通路部位')">-->
-        <!--            <el-form-item label="血管通路部位: ">-->
-        <!--              <el-select v-model="form.blood_access_part_id">-->
-        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-        <!--                <el-option-->
-        <!--                  v-for="item in vascularAccessOptions"-->
-        <!--                  :label="item.name"-->
-        <!--                  :value="item.id"-->
-        <!--                  :key="item.id"-->
-        <!--                ></el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8" v-if="isShow('血管通路')">-->
-        <!--            <el-form-item label="血管通路: ">-->
-        <!--              <el-select v-model="form.blood_access_part_opera_id">-->
-        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-        <!--                <el-option-->
-        <!--                  v-for="item in vascularAccessDescOptions"-->
-        <!--                  :label="item.name"-->
-        <!--                  :value="item.id"-->
-        <!--                  :key="item.id"-->
-        <!--                ></el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!-- </el-row>
-
-        <el-row :gutter="20"> -->
-
-        <!-- </el-row>
-
-
-
-          <el-row :gutter="20" > -->
-
-        <!--
-                  </el-row>
-
-
-
-
-                  <el-row :gutter="20"> -->
-        <!--          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">-->
-        <!--            <el-form-item label="内瘘震颤和血管杂音: ">-->
-        <!--              <el-select v-model="form.tremor_noise">-->
-        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-        <!--                <el-option-->
-        <!--                  v-for="item in this.$store.getters.tremor_noise"-->
-        <!--                  :label="item.name"-->
-        <!--                  :value="item.id"-->
-        <!--                  :key="item.id"-->
-        <!--                ></el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
+      
         <el-col :span="8" v-if="isShow('失衡综合症')">
           <el-form-item label="失衡综合症: ">
             <el-select v-model="form.disequilibrium_syndrome">
@@ -521,36 +455,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <!--          <el-col :span="8" v-if="isShow('失衡综合症症状')">-->
-        <!--            <el-form-item label="失衡综合症症状: ">-->
-        <!--              <el-input-->
-        <!--                v-model="form.disequilibrium_syndrome_option"-->
-        <!--                readonly-->
-        <!--                @focus="showDialog('8')"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-
-        <!-- </el-row>
-
-
-
-          <el-row :gutter="20"  > -->
-
-        <!--          <el-col :span="8" v-if="isShow('透析器')">-->
-        <!--            <el-form-item label="透析器凝血: ">-->
-        <!--              <el-select v-model="form.dialyzer">-->
-        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-        <!--                <el-option-->
-        <!--                  v-for="item in this.$store.getters.dialyzer"-->
-        <!--                  :label="item.name"-->
-        <!--                  :value="item.id"-->
-        <!--                  :key="item.id"-->
-        <!--                ></el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
+      
         <el-col :span="8" v-if="isShow('透析期间进食')">
           <el-form-item label="透析期间进食: ">
             <el-radio-group v-model="form.is_eat">
@@ -693,6 +598,12 @@
               </el-select>
             </el-form-item>
        </el-col>
+
+       <el-col :span="8" v-if="isShow('透后尿素')">
+            <el-form-item label="透后尿素(mmol/L):" label-width="150px">
+              <el-input v-model="form.after_urea"></el-input>
+            </el-form-item>
+       </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
             <el-form-item label="KT/V：">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
@@ -869,6 +780,7 @@ export default {
         consciousness:"",
         fallrisk:"",
         machine_run:"",
+        after_urea:"",
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1086,6 +998,7 @@ export default {
       data["consciousness"] = this.form.consciousness
       data["fallrisk"] = this.form.fallrisk
       data["machine_run"] = this.form.machine_run
+      data["after_urea"] = this.form.after_urea
       console.log("Paramsquery",data)
      
       postAssessmentAfterDislysis(ParamsQuery, data)

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -538,6 +538,14 @@
              <el-input v-model="assessmentBeforeDislysis.blood_pressure_during_dialysis"></el-input>
             </el-form-item>
           </el-col>
+
+     
+
+           <el-col :span="8" v-if="isShow('透前尿素')">
+            <el-form-item label="透前尿素(mmol/L):" label-width="150px">
+              <el-input v-model="assessmentBeforeDislysis.urea_befor"></el-input>
+            </el-form-item>
+          </el-col>
          
           <el-col :span="24">
             <el-form-item label="备注： ">
@@ -707,6 +715,7 @@
           period:"",
           estimated_food_intake:"",
           blood_pressure_during_dialysis:"",
+          urea_befor:"",
         },
 
         InnerDialogProps: {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -126,8 +126,11 @@
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.is_total == 0 && (orgId == 9919 || orgId == 9671)">{{scope.row.GoodInfo.buy_price}}</span>
-            <span v-else> {{ scope.row.price }} </span>
+            <span v-if="scope.row.is_total == 0 && (orgId == 9919)">{{scope.row.GoodInfo.buy_price}}</span>
+            <span v-else> 
+              <span v-if="scope.row.price > 0"> {{ scope.row.price }} </span> 
+               <span v-if="scope.row.price == 0"> {{ scope.row.GoodInfo.packing_price }} </span> 
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center">
@@ -138,9 +141,8 @@
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.is_total == 0">{{
-              getTotal(scope.row.price, scope.row.count)
-            }}</span>
+            <span v-if="scope.row.is_total == 0 && scope.row.price > 0">{{getTotal(scope.row.price, scope.row.count)}}</span>
+             <span v-if="scope.row.is_total == 0 && scope.row.price == 0">{{getTotal(scope.row.GoodInfo.packing_price, scope.row.count)}}</span>
             <span v-else>{{ scope.row.total }}</span>
           </template>
         </el-table-column>
@@ -371,7 +373,13 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
-            total += response.data.data.list[i].price * response.data.data.list[i].count
+            if(response.data.data.list[i].price > 0){
+               total += response.data.data.list[i].price * response.data.data.list[i].count
+            }
+            if(response.data.data.list[i].price == 0){
+               total += response.data.data.list[i].GoodInfo.packing_price * response.data.data.list[i].count
+            }
+           
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
           }

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -10,7 +10,7 @@
         <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
       </div>
     </div>
-    <div class="app-container">
+    <div class="app-container" v-loading="loading">
 
     
       <drugs-stock-dialog
@@ -451,6 +451,7 @@
         drugTypeList:[],
         totalPrice:0,
         unitList:[],
+        loading:false,
       }
     },
     methods: {
@@ -705,7 +706,7 @@
       submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
-            
+            this.loading = true
             const array = this.recordInfo.recordData
           
             for (let i = 0; i < array.length; i++) {
@@ -748,9 +749,11 @@
            
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
+                this.loading = false
                 this.$message.error(response.data.msg)
                 return false
               } else {
+                this.loading = false
                 this.$message.success('入库成功')
                 this.listLoading = false
                 this.$router.back(-1)

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -24,7 +24,7 @@
       </div>
     </div>
 
-    <div class="app-container">
+    <div class="app-container" v-loading="loading">
     
       <drugs-stock-dialog
         ref="dialog"
@@ -438,6 +438,7 @@ export default {
       listLoading:false,
       unitList:[],
       drug_show:false,
+      loading:false,
     };
   },
   methods: {
@@ -648,6 +649,7 @@ export default {
     submit() {
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
+          this.loading = true
           const array = this.recordInfo.recordData;
         
           for (let i = 0; i < array.length; i++) {
@@ -699,8 +701,10 @@ export default {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               this.listLoading = false
+              this.loading = false
               return false;
             } else {
+              this.loading = false
               this.$message.success("入库成功");
               this.listLoading = false
               this.$router.back(-1);

src/xt_pages/stock/stockFlow.vue

@@ -107,7 +107,8 @@
     
         <el-table-column prop="drug_name" label="单价"  align="center">
            <template slot-scope="scope">
-             <span>{{scope.row.price}}</span>
+             <span v-if="scope.row.price >0">{{scope.row.price}}</span>
+             <span v-if="scope.row.price == 0">{{good.packing_price}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="有效期" align="center">
@@ -226,7 +227,8 @@
         keywords:"",
         obj:{},
         packing_unit:"",
-        cancelCountList:[]
+        cancelCountList:[],
+        good:{}
       }
     },
     methods:{
@@ -432,6 +434,7 @@
             console.log("total",total)
             this.tableList = list
             this.total = total
+            this.good = response.data.data.good
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
           }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -10,7 +10,7 @@
         <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
       </div>
     </div>
-    <div class="app-container">
+    <div class="app-container" v-loading="loading">
 
       <stock-in-dialog ref="dialog" :propForm="propForm"
                        :visibility="isVisibility"
@@ -377,7 +377,7 @@
         goodType: [],
         manufacturerList:[],
         goodList:[],
-       
+        loading:false,
       }
     },
     methods: {
@@ -663,6 +663,7 @@
         console.log("res23322332",this.$refs)
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
+            this.loading = true
             const array = this.recordInfo.recordData
             console.log("array9999999",array)
             for (let i = 0; i < array.length; i++) {
@@ -710,11 +711,13 @@
             
             postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
+                this.loading = false
                 this.$message.error(response.data.msg)
                 loading.close()
                 return false
               } else {
                 loading.close()
+                this.loading = false
                 this.$message.success('入库成功')
                 this.$router.back(-1)
               }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -24,7 +24,7 @@
       </div>
     </div>
 
-    <div class="app-container">
+    <div class="app-container" v-loading="loading">
       <stock-in-dialog
         ref="dialog"
         :propForm="propForm"
@@ -393,7 +393,8 @@ export default {
       dealerList: [],
       goodType: [],
       manufacturerList:[],
-      numberList:[]
+      numberList:[],
+      loading:false,
     };
   },
   methods: {
@@ -611,6 +612,7 @@ export default {
      
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
+          this.loading = true
           const array = this.recordInfo.recordData;
           for (let i = 0; i < array.length; i++) {
             if (array[i].good_type_id == 0) {
@@ -660,11 +662,13 @@ export default {
             this.form.dealer
           ).then(response => {
             if (response.data.state == 0) {
+              this.loading =false
               this.$message.error(response.data.msg);
               loading.close()
               return false;
             } else {
               loading.close()
+              this.loading = false
               this.$message.success("入库成功");
               this.$router.back(-1);
             }

src/xt_pages/stock/stockOutOrder.vue

@@ -206,13 +206,20 @@
           </el-table-column>
           <el-table-column label="出货价" align="center">
             <template slot-scope="scope">
-              {{ scope.row.price}}
+              <span v-if="scope.row.price >0">{{ scope.row.price}}</span> 
+              <span v-if="scope.row.price == 0">{{ scope.row.packing_price}}</span> 
             </template>
           </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-             <span v-if="scope.row.is_sys == 0">{{ (scope.row.count * scope.row.price).toFixed(2)}}</span> 
-             <span v-if="scope.row.is_sys == 1">{{(getOutStockCount(scope.row.good_id)*scope.row.price).toFixed(2)}}</span>
+             <span v-if="scope.row.is_sys == 0">
+               <span v-if="scope.row.price>0"> {{ (scope.row.count * scope.row.price).toFixed(2)}}</span>
+               <span v-if="scope.row.price == 0"> {{ (scope.row.count * scope.row.packing_price).toFixed(2)}}</span>
+              </span> 
+             <span v-if="scope.row.is_sys == 1">
+                <span v-if="scope.row.price >0 "> {{(getOutStockCount(scope.row.good_id)*scope.row.price).toFixed(2)}}</span>
+                <span v-if="scope.row.price ==0"> {{(getOutStockCount(scope.row.good_id)*scope.row.packing_price).toFixed(2)}}</span>
+             </span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -1486,7 +1493,7 @@ export default {
       }, 
      
       GetOrderDetailById(val){
-        console.log("val",val)
+       
          this.userList =[]
          var params = {
            id:val.warehouse_out_id,

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -224,11 +224,11 @@
         }
         getWarehouseOutInfo(params).then(response => {
           if (response.data.state == 0) {
-
+ 
             this.$message.error(response.data.msg)
             return false
           } else {
-           
+            console.log("list2332323232323223",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }

src/xt_pages/supply/components/addGoodOrder.vue

@@ -30,8 +30,8 @@
         value-format="yyyy-MM-dd"
         @change="startTimeChange"
         ></el-date-picker>
-        <span>交货日期:</span>
-        <el-date-picker
+        <!-- <span>交货日期:</span> -->
+        <!-- <el-date-picker
             size="small"
             v-model="end_time"
             prefix-icon="el-icon-date"
@@ -43,16 +43,15 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="endTimeChange"
-        ></el-date-picker>
-        <span>单据编码:{{number}}</span>
+        ></el-date-picker> -->
+        <span>单据编码:{{good_number}}</span>
 
     </div>
     <div>
-        <el-button size="small" type="primary" @click="toAdd">生成购货单</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">审核</el-button>
-        <el-button size="small" type="primary" v-if="is_check == 1" @click="checkPurchaseOrder">反审核</el-button>
+        <el-button size="small" type="primary" @click="saveGoodOrder" v-show="showOne">保存</el-button>
+         <el-button size="small" type="primary" @click="updateGoodOrder" v-show="showTwo">修改</el-button>
+        <el-button size="small" type="primary"  @click="checkPurchaseOrder">审核</el-button>
+
        
     </div>
     </div>
@@ -95,9 +94,9 @@
             <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"></el-input>
         </template>
     </el-table-column>
-    <el-table-column label="规格&单位" align="center" width="200px">
+    <el-table-column label="规格&单位" align="center" width="120px">
         <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_specification_name" style="width:150px" :disabled="true"></el-input>
+            <el-input v-model="scope.row.supply_specification_name" style="width:100px" :disabled="true"></el-input>
         </template>
     </el-table-column>
      <el-table-column label="单位" align="center" width="120px">
@@ -117,9 +116,33 @@
           </el-form-item>  
         </template>
     </el-table-column>
-    <el-table-column label="可用库存" align="center" width="130px">
+    <el-table-column label="批号" align="center" width="130px">
+         <template slot="header" slot-scope="scope">
+            <span>批号<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+           <el-form-item  :prop="'tableList.' + scope.$index + '.supply_batch_number'" :rules='tableRules.supply_batch_number'>
+             <el-input v-model="scope.row.supply_batch_number" style="width:80px" :disabled="disabled"></el-input>
+          </el-form-item>
+        </template>
+    </el-table-column>
+     <el-table-column label="有效日期" align="center" width="200px">
+        <template slot="header" slot-scope="scope">
+              <span>有效日期<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item  :prop="'tableList.' + scope.$index + '.supply_expiry_date'"
+                :rules="tableRules.supply_expiry_date">
+                <el-date-picker prefix-icon="el-icon-date" style="width:180px" v-model="scope.row.supply_expiry_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+             </el-form-item>
+       </template>
+    </el-table-column>
+    <el-table-column label="可用库存" align="center" width="100px">
         <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
+            <el-input v-model="scope.row.supply_total" style="width:80px" :disabled="true"></el-input>
         </template>
     </el-table-column>
     <el-table-column label="数量" align="center" width="120px">
@@ -144,10 +167,31 @@
           {{calculate(scope.row.supply_count * scope.row.supply_price)}}
         </template>
     </el-table-column>
-
-    <el-table-column label="生产厂商" align="center" width="200px">
+    <el-table-column label="生产日期" align="center" width="200px">
+         <template slot="header" slot-scope="scope">
+            <span>生产日期<span style="color: red">*</span></span>
+        </template>
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input>
+          <el-form-item  :prop="'tableList.' + scope.$index + '.supply_product_date'"
+                :rules="tableRules.supply_product_date">
+                <el-date-picker prefix-icon="el-icon-date" style="width: 180px" v-model="scope.row.supply_product_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+          </el-form-item>
+        </template>
+    </el-table-column>
+    <el-table-column label="生产厂家" align="center" width="200px">
+        <template slot-scope="scope">
+        <!-- <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input> -->
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂商" :disabled="disabled">
+                <el-option
+                  v-for="(option, index) in manufactuerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+          </el-select>
         </template>
     </el-table-column>
 
@@ -158,6 +202,12 @@
         </template>
     </el-table-column>
 
+     <el-table-column label="关联采购订单号" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.order_number" style="width:160px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+
     <el-table-column label="备注" align="center" width="200px">
         <template slot-scope="scope">
         <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
@@ -194,7 +244,10 @@
         <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
 
         <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+      
+        <span>本次付款:<el-input style="width:100px" v-model="payment"></el-input></span>
 
+        <span>本次欠款:<el-input style="width:100px" v-model="arrearage"></el-input></span>
     </div>
 </div>
 
@@ -215,7 +268,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
-import {getInitOrder,updatePurchaseOrder,checkPurchaseOrder,getPurchaseOrderDetail} from "@/api/supply"
+import {getInitOrder,checkPurchaseOrder,getPurchaseOrderInfo,addGoodOrder,updateGoodOrder} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
@@ -262,6 +315,9 @@ return {
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+     supply_batch_number:[{required:true,message:"批号不能为空", trigger: 'blur'}],
+     supply_product_date:[{required:true,message:"生产日期不能为空", trigger: 'blur'}],
+     supply_expiry_date:[{required:true,message:"有效日期不能为空",trigger: 'blur'}]
    },
    warehousing_id:0,
    number:"",
@@ -272,6 +328,13 @@ return {
    disabled:false,
    is_check:0,
    dialogVisible:false,
+   arrearage:"",
+   payment:"",
+   good_number:"",
+   orderInfo:[],
+   showOne:true,
+   showTwo:false,
+   warese_out_id:0,
   };
 },
 methods:{
@@ -358,7 +421,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
@@ -375,7 +438,7 @@ changeName(val){
         }
 
         this.recordInfo.tableList[i].supply_price = val.supply_price?val.supply_price:""
-        this.recordInfo.tableList[i].supply_total_price = val.supply_total_price?val.supply_total_price:""
+        this.recordInfo.tableList[i].supply_total_price = (val.supply_count * val.supply_price).toFixed(2)
         this.recordInfo.tableList[i].supply_manufacturer = val.supply_manufacturer
         this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
         this.recordInfo.tableList[i].supply_remake = val.supply_remake
@@ -405,6 +468,11 @@ handleEdit(){
     tempObj['is_total'] = 1
     tempObj["project_id"] = 0
     tempObj["supply_unit"] = ""
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["order_number"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["manufacturer_id"] = ""
     this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
@@ -477,44 +545,7 @@ getTimes(time) {
     }
     return uParseTime(time, '{y}-{m}-{d}')
 },
- updatePurchaseOrder(){
-   this.loading = true 
-    if(this.supplier_name == 0 || this.supplier_name == ""){
-        this.$message.error("供应商不能为空!")
-        this.loading = false
-        return false
-    }
-   this.$refs["tableForm"].validate((valid)=>{
-      if(valid){
-        for(let i=0;i<this.recordInfo.tableList.length;i++){
-           this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
-           this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
-           this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
-           this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
-            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
-           for(let j=0;j<this.manufactuerList.length;j++){
-              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
-                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
-              }
-           }
-        }
-        var start = this.getTimes(this.start_time)
-        var end = this.getTimes(this.end_time)
-        const params = {
-        'stockIn': this.recordInfo.tableList
-        }
-        console.log("param23232332",params)  
-       
-        updatePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount,this.id,this.number).then(response=>{
-           if(response.data.state == 1){
-            this.loading = false
-             var warehousingInfo =  response.data.data.warehousingInfo
-             this.$message.success("修改成功!")
-           }
-        })
-      } 
-   })
- },
+
  getAllPrice(){
    var total_price = 0
    for(let i=0;i<this.recordInfo.tableList.length;i++){
@@ -541,37 +572,40 @@ getTimes(time) {
     }) 
   },
   getPurchaseOrderDetail(){
-      console.log("处方233223232323322323232323")
+     
       var id = this.$route.query.id
-    getPurchaseOrderDetail(id).then(response=>{
+      var ids = this.$route.query.ids
+    getPurchaseOrderInfo(id,ids).then(response=>{
       if(response.data.state == 1){
         var info = response.data.data.info
         this.is_check = info.is_check
-        this.number = info.number
         this.id = info.id
         this.supplier_name = info.supplier_id
         this.rate_of_concession = info.rate_of_concession
         this.discount_amount = info.discount_amount
+        this.number = info.number
         var orderInfo = response.data.data.orderInfo
-        if(info.is_check == 2){
-           this.disabled = false
-        }
-        if(info.is_check == 1){
-           this.disabled = true
+       
+        for(let i=0;i<orderInfo.length;i++){
+          orderInfo[i].supply_batch_number = ""
+          orderInfo[i].supply_product_date = ""
+          orderInfo[i].supply_expiry_date = ""
         }
-        console.log("drugli323322332",this.drugList)
+        console.log("drugli323322332", orderInfo)
         var drugList = response.data.data.baseList
         var goodList = response.data.data.goodList
-        for(let i=0;i<orderInfo.length;i++){
-            orderInfo[i].supply_count = orderInfo[i].count
-            orderInfo[i].supply_price = orderInfo[i].price
-            orderInfo[i].supply_remake = orderInfo[i].remark
-            orderInfo[i].type = orderInfo[i].is_source
-            orderInfo[i].project_id = orderInfo[i].project_id
-            orderInfo[i].supply_unit = orderInfo[i].supply_unit
+        for(let i=0;i< orderInfo.length;i++){
+             orderInfo[i].supply_count =  orderInfo[i].count
+             orderInfo[i].supply_price =  orderInfo[i].price
+             orderInfo[i].supply_remake =  orderInfo[i].remark
+             orderInfo[i].type =  orderInfo[i].is_source
+             orderInfo[i].project_id =  orderInfo[i].project_id
+             orderInfo[i].supply_unit =  orderInfo[i].supply_unit
+             orderInfo[i].order_number =  orderInfo[i].order_number
+             orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
            if(orderInfo[i].is_source == 1){
             for(let j=0;j<drugList.length;j++){
-                if(orderInfo[i].project_id == drugList[j].id){
+                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
@@ -587,8 +621,11 @@ getTimes(time) {
             }  
           } 
         }
-        console.log("orderINFO23323232",orderInfo)
+      
+        this.recordInfo.tableList= []
         this.recordInfo.tableList = orderInfo
+       
+          console.log("orderINFO23323232",this.recordInfo.tableList)
       }
     })  
   },
@@ -596,13 +633,146 @@ getTimes(time) {
      var id = this.$route.query.id
      this.$router.push({path:"/purchase/order/print?&id="+id})  
   },
-  toAdd(){
-    var id = this.$route.query.id
-    if(this.is_check == 2){
-      this.$message.error("该采购订单未审核,不能生成采购数据!")
-      return false
+  saveGoodOrder(){ 
+   
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+       this.$message.error("供应商不能为空!")
+       this.loading = false
+       return false
+    } 
+
+    for(let i=0;i<this.recordInfo.tableList.length;i++){
+
+        this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+        this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
+        this.recordInfo.tableList[i].supply_total_price= this.recordInfo.tableList[i].supply_total_price.toString()
+        this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+        if(this.recordInfo.tableList[i].id > 0){
+          this.recordInfo.tableList[i].type = 1
+        }
+        if(this.recordInfo.tableList[i].id == 0){
+          this.recordInfo.tableList[i].type = 2
+        }
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
+              this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+            }
+            if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
+              this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+
+        }
+    }
+    var start = this.getTimes(this.start_time)
+    this.$refs["tableForm"].validate((valid)=>{
+        if(valid){
+           this.loading = true
+           var warehousing_id = this.$route.query.id
+           var params = {
+             "stockIn":this.recordInfo.tableList,
+           } 
+        addGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehousing_id,this.number,this.rate_of_concession,this.discount_amount).then(response=>{
+          if(response.data.state == 1){
+             this.loading = false
+             this.$message.success("保存成功!")
+             this.showOne = false
+             this.showTwo = true
+             var orderInfo =  response.data.data.list
+             var warehouseOut = response.data.data.warehouseOut
+             this.warese_out_id = warehouseOut.id
+             this.good_number = warehouseOut.good_number
+             this.rate_of_concession = warehouseOut.rate_of_concession
+             this.discount_amount= warehouseOut.discount_amount
+             this.payment =warehouseOut.payment
+             this.arrearage =warehouseOut.arrearage
+             this.supplier_name = warehouseOut.supplier_id
+            
+            for(let i=0;i< orderInfo.length;i++){
+              orderInfo[i].supply_count =  orderInfo[i].count
+              orderInfo[i].supply_price =  orderInfo[i].price
+              orderInfo[i].supply_remake =  orderInfo[i].remark
+              orderInfo[i].type =  orderInfo[i].is_source
+              orderInfo[i].project_id =  orderInfo[i].project_id
+              orderInfo[i].supply_unit =  orderInfo[i].supply_unit
+              orderInfo[i].order_number =  orderInfo[i].order_number
+              orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
+              orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
+              orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
+            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(orderInfo[i].is_source == 2){
+              for(let j=0;j<this.goodList.length;j++){
+                  if(orderInfo[i].project_id == this.goodList[j].id){
+                      orderInfo[i].unitList = [{id:1,name:""}]
+                      orderInfo[i].unitList[0].name = this.goodList[j].packing_unit
+                  }
+              }  
+            } 
+          }
+          this.recordInfo.tableList= []
+          this.recordInfo.tableList = orderInfo
+            
+           }
+         })
+        }
+    })
+  },
+  updateGoodOrder(){ 
+   
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+       this.$message.error("供应商不能为空!")
+       this.loading = false
+       return false
+    } 
+    console.log("表哥2323233232",this.recordInfo.tableList)
+    for(let i=0;i<this.recordInfo.tableList.length;i++){
+
+        this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+        this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
+        this.recordInfo.tableList[i].supply_total_price= this.recordInfo.tableList[i].supply_total_price.toString()
+        this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+        if(this.recordInfo.tableList[i].id > 0){
+          this.recordInfo.tableList[i].type = 1
+        }
+        if(this.recordInfo.tableList[i].id == 0){
+          this.recordInfo.tableList[i].type = 2
+        }
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
+              this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+            }
+            if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
+              this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+
+        }
     }
-    this.$router.push({path:"/purchase/order/add?id="+id})
+    var start = this.getTimes(this.start_time)
+    this.$refs["tableForm"].validate((valid)=>{
+        if(valid){
+           this.loading = true
+           var warehose_out_id = this.$route.query.id
+           var params = {
+             "stockIn":this.recordInfo.tableList,
+           } 
+           console.log("sotckind23232232323232323232",params)
+           
+           updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then(response=>{
+           if(response.data.state == 1){
+             this.loading = false
+             this.$message.success("修改成功!")
+             
+           }
+         })
+        }
+    })
   }
 },
 created(){
@@ -623,9 +793,17 @@ created(){
     tempObj['is_total'] = 1
     tempObj["project_id"] = 0
     tempObj["supply_unit"] = ""
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["order_number"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["manufacturer_id"] = ""
     this.recordInfo.tableList.push(tempObj)
     this.getInitOrder()
-    this.getPurchaseOrderDetail()
+    if(parseInt(this.$route.query.id) > 0){
+      this.getPurchaseOrderDetail()
+    }
+  
 }
 };
 </script>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -7,8 +7,7 @@
     <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
     <div>
         <span style="color:red">*</span><span>供应商:</span>
-        <el-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择"
-        @change="changeTypeName">
+        <el-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择">
         <el-option
             v-for="item in supplyList"
             :key="item.id"
@@ -28,7 +27,6 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
-        @change="startTimeChange"
         ></el-date-picker>
         <span>交货日期:</span>
         <el-date-picker
@@ -42,7 +40,6 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            @change="endTimeChange"
         ></el-date-picker>
         <span>单据编码:{{number}}</span>
 
@@ -145,16 +142,24 @@
         </template>
     </el-table-column>
 
-    <el-table-column label="生产厂商" align="center" width="200px">
+    <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input>
+        
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择生产厂家" :disabled="true">
+                <el-option
+                  v-for="(option, index) in manufactuerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+          </el-select>
         </template>
     </el-table-column>
 
 
     <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>
 
@@ -191,7 +196,7 @@
       合计:{{getAllPrice()}} 元
    </div>
    <div style="margin-top:10px">
-        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
+        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession" @input='addressChange'></el-input>%</span>
 
         <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
 
@@ -282,6 +287,7 @@ return {
    goodList:[
      {id:1,name:""},
    ],
+   total_price:0,
   };
 },
 methods:{
@@ -372,7 +378,6 @@ changeGoodName(val){
   this.currentIndex = val
 },
 changeName(val){
-   console.log("val3233232322332",val)
    for(let i=0;i<this.recordInfo.tableList.length;i++){
     if(this.currentIndex == i){
         this.recordInfo.tableList[i].project_id = val.id
@@ -433,14 +438,16 @@ handleDelete: function(index, row) {
 
 
 savePurchaseOrder(){
-    this.loading = true
+   
     if(this.supplier_name == 0 || this.supplier_name == ""){
        this.$message.error("供应商不能为空!")
        this.loading = false
        return false
     }
     this.$refs["tableForm"].validate((valid)=>{
+     
       if(valid){
+         this.loading = true
         for(let i=0;i<this.recordInfo.tableList.length;i++){
             this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
             this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
@@ -449,17 +456,18 @@ savePurchaseOrder(){
             this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
             for(let j=0;j<this.manufactuerList.length;j++){
                 if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
-                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+                  this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
                 }
 
             }
         }
         var start = this.getTimes(this.start_time)
         var end = this.getTimes(this.end_time)
-         const params = {
+        const params = {
             'stockIn': this.recordInfo.tableList
-         }
-       
+        }
+        
+        console.log("params23322323",params)
         savePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount).then(response=>{
             if(response.data.state == 1){
                 var order =  response.data.data.order
@@ -525,21 +533,6 @@ savePurchaseOrder(){
    })
 
 },
-
-
-changeTypeName(){
-
-},
-startTimeChange(){
-
-},
-endTimeChange(){
-
-},
-search(){
-
-},
-
 getWarehoseInfo(arr,max_unit,min_unit,min_number){
     var total = 0
     var max_str=  ""
@@ -589,7 +582,7 @@ getTimes(time) {
     return uParseTime(time, '{y}-{m}-{d}')
 },
  updatePurchaseOrder(){
-   this.loading = true 
+   
     if(this.supplier_name == 0 || this.supplier_name == ""){
         this.$message.error("供应商不能为空!")
         this.loading = false
@@ -597,6 +590,7 @@ getTimes(time) {
     }
    this.$refs["tableForm"].validate((valid)=>{
       if(valid){
+        this.loading = true 
         for(let i=0;i<this.recordInfo.tableList.length;i++){
            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
            this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
@@ -604,8 +598,8 @@ getTimes(time) {
            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
             this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
            for(let j=0;j<this.manufactuerList.length;j++){
-              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
-                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
+                this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
               }
            }
         }
@@ -615,7 +609,7 @@ getTimes(time) {
         'stockIn': this.recordInfo.tableList
         }
         console.log("params23232233223",params)
-        
+       
         updatePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount,this.id,this.number).then(response=>{
            if(response.data.state == 1){
             this.loading = false
@@ -631,6 +625,12 @@ getTimes(time) {
    for(let i=0;i<this.recordInfo.tableList.length;i++){
       total_price += (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count)
    }  
+   this.total_price = total_price
+  //   var discount_amount = 0
+  //   if(this.rate_of_concession >0){
+  //      discount_amount = (this.rate_of_concession/100*total_price)
+  //   } 
+  //  this.discount_amount = discount_amount.toFixed(2)
    return total_price.toFixed(2)
  },
  checkPurchaseOrder(id,index){
@@ -638,8 +638,7 @@ getTimes(time) {
     confirmButtonText: '确 定',
     cancelButtonText: '取 消',
     type: 'warning'
-    }).then(() => {
-    console.log("id232233232323223",this.id)    
+    }).then(() => {  
     checkPurchaseOrder(this.id).then(response => {
         if (response.data.state == 1) {
           var info = response.data.data.info
@@ -658,7 +657,15 @@ getTimes(time) {
   getDataConfig(module, filed_name){
     return getDataConfig(module, filed_name)
   },
+  addressChange(){
+    var discount_amount = 0
+    if(this.rate_of_concession >0){
+       discount_amount = (this.rate_of_concession/100*this.total_price).toFixed(2)
+    } 
+    this.discount_amount = discount_amount
+ }
 },
+
 created(){
     const tempObj = {}
     tempObj["id"] = 0

src/xt_pages/supply/components/editGoodOrder.vue

@@ -0,0 +1,784 @@
+<template>
+<div class="main-contain">
+<div class="position">
+    <bread-crumb :crumbs="crumbs"></bread-crumb>
+</div>
+<div class="app-container"  v-loading="loading">
+    <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+    <div>
+        <span style="color:red">*</span><span>供应商:</span>
+        <el-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择"
+        @change="changeTypeName">
+        <el-option
+            v-for="item in supplyList"
+            :key="item.id"
+            :label="item.supplier_name"
+            :value="item.id">
+        </el-option>
+        </el-select>
+        <span>单据日期:</span>
+        <el-date-picker
+        size="small"
+        v-model="start_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="startTimeChange"
+        ></el-date-picker>
+        <!-- <span>交货日期:</span> -->
+        <!-- <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+        ></el-date-picker> -->
+        <span>单据编码:{{good_number}}</span>
+
+    </div>
+    <div>
+        <el-button size="small" type="primary" @click="updateGoodOrder">修改</el-button>
+        <el-button size="small" type="primary"  @click="checkPurchaseOrder">审核</el-button>
+
+       
+    </div>
+    </div>
+
+   <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+    <el-table
+    :row-style="{ color: '#303133' }"
+    :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+    }"
+    :data="recordInfo.tableList"
+    :class="signAndWeighBoxPatients"
+    border
+    style="width: 100%"
+    max-height="450"
+    >
+    <el-table-column align="center" width="200px">
+        <template slot="header" slot-scope="scope">
+            <span>商品<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+           <el-form-item :prop="'tableList.' + scope.$index + '.name'" :rules='tableRules.name'>
+            <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)" :disabled="disabled">
+                <el-option
+                    v-for="(item,index) in tabList"
+                    :key="index"
+                    :label="item.supply_name"
+                    :value="item">
+                </el-option>
+             </el-select>
+           </el-form-item>
+        </template>
+    </el-table-column>
+    <el-table-column  align="center" width="150px">
+        <template slot="header" slot-scope="scope">
+            <span>商品类别</span>
+        </template>
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="规格&单位" align="center" width="120px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_specification_name" style="width:100px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+     <el-table-column label="单位" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>单位<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
+            <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
+                    <el-option
+                        v-for="(item,index) in scope.row.unitList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                    </el-option>
+             </el-select>
+          </el-form-item>  
+        </template>
+    </el-table-column>
+    <el-table-column label="批号" align="center" width="130px">
+         <template slot="header" slot-scope="scope">
+            <span>批号<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+           <el-form-item  :prop="'tableList.' + scope.$index + '.supply_batch_number'" :rules='tableRules.supply_batch_number'>
+             <el-input v-model="scope.row.supply_batch_number" style="width:80px" :disabled="disabled"></el-input>
+          </el-form-item>
+        </template>
+    </el-table-column>
+     <el-table-column label="有效日期" align="center" width="200px">
+        <template slot="header" slot-scope="scope">
+              <span>有效日期<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item  :prop="'tableList.' + scope.$index + '.supply_expiry_date'"
+                :rules="tableRules.supply_expiry_date">
+                <el-date-picker prefix-icon="el-icon-date" style="width:180px" v-model="scope.row.supply_expiry_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+             </el-form-item>
+       </template>
+    </el-table-column>
+    <el-table-column label="可用库存" align="center" width="100px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_total" style="width:80px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="数量" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>数量<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
+             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled"></el-input>
+          </el-form-item>
+        </template>
+    </el-table-column>
+
+    <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">
+        <template slot-scope="scope">
+          {{calculate(scope.row.supply_count * scope.row.supply_price)}}
+        </template>
+    </el-table-column>
+    <el-table-column label="生产日期" align="center" width="200px">
+         <template slot="header" slot-scope="scope">
+            <span>生产日期<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item  :prop="'tableList.' + scope.$index + '.supply_product_date'"
+                :rules="tableRules.supply_product_date">
+                <el-date-picker prefix-icon="el-icon-date" style="width: 180px" v-model="scope.row.supply_product_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+          </el-form-item>
+        </template>
+    </el-table-column>
+    <el-table-column label="生产厂家" align="center" width="200px">
+        <template slot-scope="scope">
+        <!-- <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input> -->
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂商" :disabled="disabled">
+                <el-option
+                  v-for="(option, index) in manufactuerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+          </el-select>
+        </template>
+    </el-table-column>
+
+
+    <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>
+        </template>
+    </el-table-column>
+
+     <el-table-column label="关联采购订单号" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.order_number" style="width:160px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="备注" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="操作" align="center" width="150px" fixed="right" >
+        <template slot-scope="scope">
+        <el-tooltip class="item" effect="dark" content="新增" placement="top" >
+            <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-circle-plus-outline"
+                @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+       </el-tooltip>
+       <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+        </el-tooltip>
+
+        </template>
+    </el-table-column>
+  </el-table>
+</el-form>
+   <div style="margin-top:10px">
+      合计:{{getAllPrice()}} 元
+   </div>
+   <div style="margin-top:10px">
+        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
+
+        <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+      
+        <span>本次付款:<el-input style="width:100px" v-model="payment"></el-input></span>
+
+        <span>本次欠款:<el-input style="width:100px" v-model="arrearage"></el-input></span>
+    </div>
+</div>
+
+  <!-- <el-dialog
+  title="提示"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <span>这是一段信息</span>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+  </span>
+  </el-dialog> -->
+</div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {uParseTime } from '@/utils/tools'
+import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder} from "@/api/supply"
+export default {
+name: "addPurchaseOrder",
+components: {
+BreadCrumb
+},
+data() {
+return {
+    crumbs: [
+       { path: false, name: "购货单" },
+       { path: "/spply/query", name: "编辑购货单" }
+    ],
+    showTwo:true,
+    showOne:false,
+    recordInfo: {
+      tableList:[],
+    },
+    keywords: "",
+    total: 0,
+    multipleSelection: [],
+    signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+    start_time: "",
+    end_time: "",
+    page: 1,
+    limit: 10,
+    goodType: [],
+    goodInfo: [],
+    org_id:0,
+    types:[],
+    tyep_name:"",
+    form:{
+    manufacturer_id:"",
+    },
+    tabList:[],
+    manufactuerList:[],
+    currentIndex: 0,
+    goodTypeList:[],
+    drugTypeList:[],
+    supplier_name:"",
+    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' }],
+     supply_batch_number:[{required:true,message:"批号不能为空", trigger: 'blur'}],
+     supply_product_date:[{required:true,message:"生产日期不能为空", trigger: 'blur'}],
+     supply_expiry_date:[{required:true,message:"有效日期不能为空",trigger: 'blur'}]
+   },
+   warehousing_id:0,
+   number:"",
+   loading:false,
+   drugList:[],
+   goodList:[],
+   id:0,
+   disabled:false,
+   is_check:0,
+   dialogVisible:false,
+   arrearage:"",
+   payment:"",
+   good_number:"",
+   orderInfo:[],
+   showOne:true,
+   showTwo:false,
+   warese_out_id:0,
+  };
+},
+methods:{
+
+getInitOrder(){
+    getInitOrder().then(response=>{
+    if(response.data.state == 1){
+        var drugList = response.data.data.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
+          }
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(drugList[i].manufacturer == this.manufactuerList[j].id){
+                drugList[i].manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+        }
+        for(let y=0;y<this.drugTypeList.length;y++){
+            if(drugList[i].drug_type == this.drugTypeList[y].value){
+            drugList[i].drug_type = this.drugTypeList[y].name
+            }
+        }
+        drugList[i].supply_name =  drugList[i].drug_name + " " + drugList[i].dose +drugList[i].dose_unit+"*"+drugList[i].min_number+ drugList[i].min_unit+"/"+drugList[i].max_unit + " " + drugList[i].manufacturer
+        drugList[i].supply_type = drugList[i].drug_type
+        drugList[i].supply_specification_name = drugList[i].dose +drugList[i].dose_unit+"*"+drugList[i].min_number+ drugList[i].min_unit+"/"+drugList[i].max_unit
+        drugList[i].supply_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number)
+        drugList[i].supply_count = ""
+        drugList[i].supply_total_price = ""
+        drugList[i].supply_manufacturer=  drugList[i].manufacturer
+        drugList[i].supply_license_number= drugList[i].number
+        drugList[i].supply_remake = ""
+        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:""}]
+        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
+        }
+        this.tabList.push(drugList[i])
+        }
+        this.drugList = drugList
+        var goodList =  response.data.data.goodList
+        for(let i=0;i<goodList.length;i++){
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(goodList[i].manufacturer == this.manufactuerList[j].id){
+                goodList[i].manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+        }
+        for(let y=0;y<this.goodTypeList.length;y++){
+            if(goodList[i].good_type_id == this.goodTypeList[y].id){
+                goodList[i].good_type_id = this.goodTypeList[y].type_name
+            }
+        }
+        goodList[i].supply_name = goodList[i].good_name + " " + goodList[i].specification_name + " " +goodList[i].manufacturer
+        goodList[i].supply_type = goodList[i].good_type_id
+        goodList[i].supply_specification_name =goodList[i].specification_name
+        goodList[i].supply_price = goodList[i].buy_price
+        goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info)
+        goodList[i].supply_count = ""
+        goodList[i].supply_total_price = ""
+        goodList[i].supply_manufacturer = goodList[i].manufacturer
+        goodList[i].supply_license_number = ""
+        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].supply_unit = goodList[i].packing_unit
+        goodList[i].warehouse_info_id = 0
+        goodList[i].warehousing_id= 0
+        for(let j=0;j<goodList[i].unitList.length;j++){
+           goodList[i].unitList[0].name = goodList[i].packing_unit 
+        }
+        this.tabList.push(goodList[i])
+        }
+        this.goodList = goodList
+    } 
+    })
+},
+changeGoodName(val){
+  this.currentIndex = val
+},
+changeName(val){
+  
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
+    if(this.currentIndex == i){
+        this.recordInfo.tableList[i].project_id = val.id
+        this.recordInfo.tableList[i].type = val.type
+        this.recordInfo.tableList[i].name = val.name
+        this.recordInfo.tableList[i].supply_name = val.supply_name
+        this.recordInfo.tableList[i].supply_type = val.supply_type
+        this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name
+        this.recordInfo.tableList[i].supply_total = val.supply_total
+       
+        if(val.supply_count == NaN){
+           this.recordInfo.tableList[i].supply_count = ""
+        }else{
+          this.recordInfo.tableList[i].supply_count = val.supply_count?val.supply_count:""
+        }
+
+        this.recordInfo.tableList[i].supply_price = val.supply_price?val.supply_price:""
+        this.recordInfo.tableList[i].supply_total_price = (val.supply_count * val.supply_price).toFixed(2)
+        this.recordInfo.tableList[i].supply_manufacturer = val.supply_manufacturer
+        this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
+        this.recordInfo.tableList[i].supply_remake = val.supply_remake
+        this.recordInfo.tableList[i].is_total = val.is_total
+        this.recordInfo.tableList[i].supply_unit = val.supply_unit
+        this.recordInfo.tableList[i].unitList = val.unitList
+        this.recordInfo.tableList[i].warehouse_info_id = val.warehouse_info_id
+        this.recordInfo.tableList[i].warehousing_id = val.warehousing_id
+     }
+    }
+   
+
+},
+handleEdit(){
+    const tempObj = {}
+    tempObj["id"] = 0
+    tempObj["name"] = ""
+    tempObj['supply_name'] = ""
+    tempObj['supply_type'] = ""
+    tempObj['supply_specification_name'] = ''
+    tempObj['supply_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
+    tempObj['supply_manufacturer'] = ''
+    tempObj['supply_license_number'] = ''
+    tempObj['supply_remake'] = ''
+    tempObj['type'] = 0
+    tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["order_number"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["manufacturer_id"] = ""
+    tempObj["warehouse_info_id"] = ""
+    tempObj["warehousing_id"]= ""
+    this.recordInfo.tableList.push(tempObj)
+},
+handleDelete: function(index, row) {
+  if (this.recordInfo.tableList.length <= 1) {
+        this.$message.error('只有一条记录的时候无法删除')
+        return
+   } else {
+        this.recordInfo.tableList.splice(index, 1)
+   }
+},
+
+changeTypeName(){
+
+},
+startTimeChange(){
+
+},
+endTimeChange(){
+
+},
+search(){
+
+},
+
+getWarehoseInfo(arr,max_unit,min_unit,min_number){
+    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)
+      }
+    }
+    if (total < min_number){
+        min_str = total + min_unit
+    }
+    if (total == 0) {
+        min_str = ""
+        max_str = ""
+    }
+   if (total >=min_number) {
+    if(parseInt(total/min_number)!=0){
+        max_str = parseInt(total/min_number) + max_unit
+    }
+    if(total%min_number!=0){
+       min_str = total%min_number + min_unit
+    }
+  }
+ return max_str + min_str
+ },
+getTotalStockCount(arr){
+  var total_count = 0
+  for(let i=0;i<arr.length;i++){
+    total_count += arr[i].stock_count
+  }
+  return total_count
+},
+calculate: function(val) {
+    if (isNaN(val)) {
+        return "";
+    }
+    if (val == 0) {
+        return "";
+    }
+    return Math.round(parseFloat(val) * 100) / 100;
+  },
+getTimes(time) {
+    if (time === '') {
+    return ''
+    }
+    return uParseTime(time, '{y}-{m}-{d}')
+},
+
+ getAllPrice(){
+   var total_price = 0
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
+      total_price += (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count)
+   }  
+   return total_price.toFixed(2)
+ },
+ checkPurchaseOrder(id,index){
+   this.$confirm('是否审核?', {
+    confirmButtonText: '确 定',
+    cancelButtonText: '取 消',
+    type: 'warning'
+    }).then(() => { 
+    checkPurchaseOrder(this.id).then(response => {
+        if (response.data.state == 1) {
+          var info = response.data.data.info
+          this.disabled = true
+          this.$message.success("审核成功!")
+          this.getPurchaseOrderDetail()
+        } 
+     })
+    })
+    .catch(() => {
+    }) 
+  },
+  getGoodOrderDetail(){
+     
+      var id = this.$route.query.id
+    getGoodOrderDetail(id).then(response=>{
+      if(response.data.state == 1){
+        var out = response.data.data.out
+        this.is_check = out.is_check
+        this.id = out.id
+        this.supplier_name = out.supplier_id
+        this.rate_of_concession = out.rate_of_concession
+        this.discount_amount = out.discount_amount
+        this.payment = out.payment
+        this.arrearage = out.arrearage
+        this.number = out.number
+        this.good_number = out.good_number
+        var orderInfo = response.data.data.list
+        
+        var drugList = response.data.data.drugList
+        var goodList = response.data.data.goodList
+        for(let i=0;i< orderInfo.length;i++){
+             
+             orderInfo[i].supply_count =  orderInfo[i].count
+             orderInfo[i].supply_price =  orderInfo[i].price
+             orderInfo[i].supply_remake =  orderInfo[i].remark
+             orderInfo[i].type =  orderInfo[i].is_source
+             orderInfo[i].project_id =  orderInfo[i].project_id
+             orderInfo[i].supply_unit =  orderInfo[i].supply_unit
+             orderInfo[i].order_number =  orderInfo[i].order_number
+             orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
+             orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
+             orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
+           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(orderInfo[i].is_source == 2){
+            for(let j=0;j<goodList.length;j++){
+                if(orderInfo[i].project_id == goodList[j].id){
+                    orderInfo[i].unitList = [{id:1,name:""}]
+                    orderInfo[i].unitList[0].name = goodList[j].packing_unit
+                }
+            }  
+          } 
+        }
+      
+        this.recordInfo.tableList= []
+        this.recordInfo.tableList = orderInfo
+       
+          console.log("orderINFO23323232",this.recordInfo.tableList)
+      }
+    })  
+  },
+  toPrint(){
+     var id = this.$route.query.id
+     this.$router.push({path:"/purchase/order/print?&id="+id})  
+  },
+  updateGoodOrder(){ 
+   
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+       this.$message.error("供应商不能为空!")
+       this.loading = false
+       return false
+    } 
+    console.log("表哥2323233232",this.recordInfo.tableList)
+    for(let i=0;i<this.recordInfo.tableList.length;i++){
+
+        this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+        this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
+        this.recordInfo.tableList[i].supply_total_price= this.recordInfo.tableList[i].supply_total_price.toString()
+        this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+        if(this.recordInfo.tableList[i].id > 0){
+          this.recordInfo.tableList[i].type = 1
+        }
+        if(this.recordInfo.tableList[i].id == 0){
+          this.recordInfo.tableList[i].type = 2
+        }
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
+              this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+            }
+            if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
+              this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+
+        }
+    }
+    var start = this.getTimes(this.start_time)
+    this.$refs["tableForm"].validate((valid)=>{
+        if(valid){
+           this.loading = true
+           var warehose_out_id = this.$route.query.id
+           var params = {
+             "stockIn":this.recordInfo.tableList,
+           } 
+           console.log("sotckind23232232323232323232",params)
+           
+           updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then(response=>{
+           if(response.data.state == 1){
+             this.loading = false
+             this.$message.success("修改成功!")
+             
+           }
+         })
+        }
+    })
+  }
+},
+created(){
+    const tempObj = {}
+    tempObj["id"] = 0
+    tempObj["name"] = ""
+    tempObj['supply_name'] = ""
+    tempObj['supply_type'] = ""
+    tempObj['supply_specification_name'] = ''
+    tempObj['supply_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
+    tempObj['supply_manufacturer'] = ''
+    tempObj['supply_license_number'] = ''
+    tempObj['supply_remake'] = ''
+    tempObj['type'] = 0
+    tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["order_number"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["manufacturer_id"] = ""
+    tempObj["warehouse_info_id"] = ""
+    tempObj["warehousing_id"]= ""
+    this.recordInfo.tableList.push(tempObj)
+    this.getInitOrder()
+    if(parseInt(this.$route.query.id) > 0){
+      this.getGoodOrderDetail()
+    }
+  
+}
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+border: 1px #dcdfe6 solid;
+padding: 30px 20px 30px 20px;
+
+.border {
+border-bottom: 1px #dcdfe6 solid;
+margin: 0px 0 20px 0;
+}
+}
+
+.title {
+background: #409eff;
+height: 44px;
+line-height: 44px;
+padding: 0 0 0 10px;
+color: #fff;
+margin: 0 0 10px 0;
+}
+
+.edit_separater {
+border-top: 1px solid rgb(233, 233, 233);
+margin-top: 15px;
+margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+background: #6fb5fa;
+}
+
+.count {
+color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+background-color: #d0d3da;
+}
+.el-table__fixed-right{
+  width:150px;
+  bottom: 20px;
+  height: 100%;
+}
+</style>

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -117,16 +117,8 @@
           </el-form-item>  
         </template>
     </el-table-column>
-    <el-table-column label="批号" align="center" width="130px">
-        <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
-        </template>
-    </el-table-column>
-    <el-table-column label="有效日期" align="center" width="130px">
-        <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
-        </template>
-    </el-table-column>
+   
+  
     <el-table-column label="可用库存" align="center" width="130px">
         <template slot-scope="scope">
             <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
@@ -155,14 +147,16 @@
         </template>
     </el-table-column>
 
-    <el-table-column label="生产日期" align="center" width="200px">
-        <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input>
-        </template>
-    </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input>
+           <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂商" :disabled="disabled">
+                <el-option
+                  v-for="(option, index) in manufactuerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+          </el-select>
         </template>
     </el-table-column>
 
@@ -172,11 +166,7 @@
         <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
-    <el-table-column label="关联采购订单号" align="center" width="200px">
-        <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
-        </template>
-    </el-table-column>
+ 
     <el-table-column label="备注" align="center" width="200px">
         <template slot-scope="scope">
         <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
@@ -210,13 +200,11 @@
       合计:{{getAllPrice()}} 元
    </div>
    <div style="margin-top:10px">
-        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
+        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession" @input='addressChange'></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"></el-input></span>
-
-        <span>本次欠款:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+      
 
     </div>
 </div>
@@ -238,7 +226,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
-import {getInitOrder,updatePurchaseOrder,checkPurchaseOrder,getPurchaseOrderDetail} from "@/api/supply"
+import {getInitOrder,updatePurchaseOrder,checkPurchaseOrder,getPurchaseOrderDetail,getAllOrderCountList} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
@@ -295,6 +283,7 @@ return {
    disabled:false,
    is_check:0,
    dialogVisible:false,
+   total_price:0,
   };
 },
 methods:{
@@ -411,6 +400,10 @@ changeName(val){
 
 },
 handleEdit(){
+    if(this.is_check == 1){
+      this.$message.error("已审核的不能新增!")
+      return false
+    }
     const tempObj = {}
     tempObj["id"] = 0
     tempObj["name"] = ""
@@ -428,6 +421,7 @@ handleEdit(){
     tempObj['is_total'] = 1
     tempObj["project_id"] = 0
     tempObj["supply_unit"] = ""
+    tempObj["manufacturer_id"] = ""
     this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
@@ -501,7 +495,7 @@ getTimes(time) {
     return uParseTime(time, '{y}-{m}-{d}')
 },
  updatePurchaseOrder(){
-   this.loading = true 
+   
     if(this.supplier_name == 0 || this.supplier_name == ""){
         this.$message.error("供应商不能为空!")
         this.loading = false
@@ -509,6 +503,9 @@ getTimes(time) {
     }
    this.$refs["tableForm"].validate((valid)=>{
       if(valid){
+        this.loading = true 
+        console.log("生产厂商",this.recordInfo.tableList)
+        console.log("生产上次",this.manufactuerList)
         for(let i=0;i<this.recordInfo.tableList.length;i++){
            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
            this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
@@ -516,8 +513,8 @@ getTimes(time) {
            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
             this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
            for(let j=0;j<this.manufactuerList.length;j++){
-              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
-                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
+                 this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
               }
            }
         }
@@ -543,6 +540,7 @@ getTimes(time) {
    for(let i=0;i<this.recordInfo.tableList.length;i++){
       total_price += (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count)
    }  
+   this.total_price = total_price
    return total_price.toFixed(2)
  },
  checkPurchaseOrder(id,index){
@@ -624,7 +622,55 @@ getTimes(time) {
       this.$message.error("该采购订单未审核,不能生成采购数据!")
       return false
     }
-    this.$router.push({path:"/good/order/add?id="+id})
+    //获取商品购货订单 和 购货单的总数量
+    getAllOrderCountList(id).then(response=>{
+      if(response.data.state == 1){
+        var purcaseOrder = response.data.data.purcaseOrder
+        console.log("采购订单",purcaseOrder)
+        var goodOrder = response.data.data.goodOrder
+        console.log("采购单",goodOrder)
+        var arr = []
+        var total = 0
+        var str = ""
+        // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
+        if(goodOrder.length == 0){
+          this.$router.push({path:"/good/order/add?id="+id+"&ids="+str})
+        }
+        //如果采购单有数据，则需要比较数量
+        if(goodOrder.length > 0){
+          for(let i=0;i<purcaseOrder.length;i++){
+            for(let j=0;j<goodOrder.length;j++){
+              if(purcaseOrder[i].project_id == goodOrder[j].project_id){
+                  //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
+                  if(purcaseOrder[i].count > goodOrder[j].count){
+                     arr.push(purcaseOrder[i].project_id)
+                  }
+
+              }
+            }
+          }
+          //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
+         
+          if(arr.length == 0){
+            this.$message.error("该订单已全部生成采购单，请知悉!")
+          }
+          
+
+          if(total!=goodOrder.length){
+             str = arr.join(",")
+            this.$router.push({path:"/good/order/add?id="+id+"&ids="+str})
+          }
+        }
+       
+       
+      }
+    })
+    
+  },
+  addressChange(){
+    if(this.rate_of_concession >0){
+     this.discount_amount = (this.rate_of_concession/100*this.total_price).toFixed(2)
+    } 
   }
 },
 created(){
@@ -645,6 +691,7 @@ created(){
     tempObj['is_total'] = 1
     tempObj["project_id"] = 0
     tempObj["supply_unit"] = ""
+    tempObj["manufacturer_id"] = ""
     this.recordInfo.tableList.push(tempObj)
     this.getInitOrder()
     this.getPurchaseOrderDetail()

src/xt_pages/supply/goodOrderQuery.vue

@@ -82,7 +82,7 @@
         </el-table-column>
         <el-table-column label="单据编号" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.number}}</span>
+            <span>{{scope.row.good_number}}</span>
           </template>
         </el-table-column>
         <el-table-column label="供应商" align="center">
@@ -92,17 +92,17 @@
          </el-table-column>
         <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">
           <template slot-scope="scope">
-             <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span> 
+             <span v-if="getAllBuyPrice(scope.row.orderOut)>0">{{getAllBuyPrice(scope.row.orderOut)}}</span> 
           </template>
         </el-table-column>
         <el-table-column label="优惠后金额" align="center">
          <template slot-scope="scope">
-           {{getAllCount(scope.row.orderInfo)}}
+           {{getAllCount(scope.row.orderOut)}}
          </template>
        </el-table-column>
         <el-table-column label="已付款" align="center">
@@ -112,7 +112,7 @@
        </el-table-column>
        <el-table-column label="数量" align="center">
          <template slot-scope="scope">
-           {{getAllCount(scope.row.orderInfo)}}
+           {{getAllCount(scope.row.orderOut)}}
          </template>
        </el-table-column>
 
@@ -175,7 +175,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllPurchaseOrderList} from "@/api/supply"
+import {getAllSupply,getAllGoodOrderList} from "@/api/supply"
 import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
@@ -217,7 +217,8 @@ export default {
   },
   methods:{
      toAdd(){
-       this.$router.push({path:"/purchase/order/add"})
+       var id = 0
+       this.$router.push({path:"/good/order/add?id="+id})
      },
      changeTypeName(){
 
@@ -268,10 +269,10 @@ export default {
           page:this.page,
           limit:this.limit,
         }
-       getAllPurchaseOrderList(params).then(response=>{
+       getAllGoodOrderList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list 
-            console.log("list2332232323232",list)
+            console.log("购货单列表",list)
             this.tableList = list
             var total = response.data.data.total
             this.total = total
@@ -315,7 +316,7 @@ export default {
        return count
      },
      toClick(id){
-       this.$router.push({path:"/purchase/order/edit?id="+id})
+       this.$router.push({path:"/good/order/edit?id="+id})
      }
   },
   created() {

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -92,7 +92,11 @@
          </el-table-column>
         <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">
+                 <td>{{item.good_number}}</td>
+              </tr>
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="购物金额" align="center">
@@ -106,14 +110,14 @@
            {{getAllCount(scope.row.orderInfo)}}
          </template>
        </el-table-column>
-
        <el-table-column label="订单状态" align="center">
          <template slot-scope="scope">
-           <span v-if="scope.row.is_check == 2">未审核</span>
-           <span v-if="scope.row.is_check == 1">已审核</span>
+           <span v-if="scope.row.is_warehouse == 1">全部入库</span>
+           <span v-if="scope.row.is_warehouse == 2">未入库</span>
+           <span v-if="scope.row.is_warehouse == 3">部分入库</span>
          </template>
        </el-table-column>
-      
+     
         <el-table-column label="交货日期" align="center">
          <template slot-scope="scope">
            {{getTimes(scope.row.delivery_date)}}
@@ -133,7 +137,7 @@
          </template>
        </el-table-column>
 
-       <el-table-column label="操作" align="center" width="260px">
+       <el-table-column label="操作" align="center" width="200px">
           <template slot-scope="scope">
               <el-button
                 icon="el-icon-edit-outline"
@@ -146,7 +150,7 @@
                 icon="el-icon-delete"
                 size="small"
                 type="danger"
-                @click="toClickOne(scope.row)"
+                @click="toDelete(scope.row,scope.$index)"
               >删除
               </el-button>
           </template>
@@ -172,7 +176,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllPurchaseOrderList} from "@/api/supply"
+import {getAllSupply,getAllPurchaseOrderList,deletePurchaseOrder} from "@/api/supply"
 import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
@@ -217,16 +221,16 @@ export default {
        this.$router.push({path:"/purchase/order/add"})
      },
      changeTypeName(){
-
+       this.getlist()
      },
      startTimeChange(){
-
+      this.getlist()
      },
      endTimeChange(){
-
+      this.getlist()
      },
      search(){
-
+      this.getlist()
      },
      handleSizeChange(val){
        this.limit = val
@@ -246,9 +250,6 @@ export default {
             }
          }
        })
-     },
-     changeTypeName(){
-
      },
      getTimes(time) {
       if (time === '') {
@@ -268,7 +269,6 @@ export default {
        getAllPurchaseOrderList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list 
-            console.log("list2332232323232",list)
             this.tableList = list
             var total = response.data.data.total
             this.total = total
@@ -313,7 +313,35 @@ export default {
      },
      toClick(id){
        this.$router.push({path:"/purchase/order/edit?id="+id})
-     }
+     },
+     toDelete(val,index){
+       if(val.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
+       }
+       if(val.orderOut.length >0 ){
+         this.$message.error("已关联单据，不能删除!")
+         return false
+       }
+       this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+            
+          deletePurchaseOrder(val.id).then(response => {
+            if (response.data.state == 1) {
+                var msg = response.data.data.msg
+                this.tableList.splice(index, 1);
+                this.$message.success("删除成功")
+            } else {
+                this.$message.error("删除失败")
+            }
+          })
+        })
+        .catch(() => {
+        }) 
+      }
   },
   created() {
     var now = new Date(); //当前日期 
@@ -329,6 +357,28 @@ export default {
  
 };
 </script>
+<style lang="scss">
+  .cluster-rs {
+    text-align: center;
+  }
+  .annotation-rs{
+    width: 100%;
+    height: 100%;
+    border: none;
+    td{
+      width: 155px;
+      padding: 5px;
+      border-right: none;
+      text-align: center;
+      vertical-align: middle;
+    }
+  }
+  tr:last-child{
+    td{
+      border-bottom: none;
+    }
+  }
+</style>
 
 <style rel="stylesheet/css" lang="scss" scoped>
 .information {