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

src/api/supply.js

@@ -160,7 +160,6 @@ export function getAllGoodReturnOrderList(params) {
   })
 }
 
-
 export function getSupplierId(params) {
   return request({
     url: '/api/supply/getsupplycode',
@@ -185,7 +184,6 @@ export function getGoodReturnDetail(id, params) {
   })
 }
 
-
 export function getexporthistory(params) {
   return request({
     url: '/api/supply/getsupplylist',
@@ -267,7 +265,7 @@ export function savesupply(data) {
 }
 
 export function updatesupply(data) {
-  console.log(data,'oopo')
+  console.log(data, 'oopo')
   return request({
     url: '/api/supply/updatesupply',
     method: 'post',
@@ -275,6 +273,13 @@ export function updatesupply(data) {
   })
 }
 
+export function checkGoodOrderById(id, params) {
+  return request({
+    url: '/api/supply/checkgoodorderbyid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
 
 // export function getsupplytype(params) {
 //   return request({
@@ -284,5 +289,50 @@ export function updatesupply(data) {
 //   })
 // }
 
+export function checkReturnOrder(params) {
+  return request({
+    url: '/api/supply/checkreturnorder',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function deletePurchOder(params) {
+  return request({
+    url: '/api/supply/deletepurchaseorder',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteGoodOrderById(params) {
+  return request({
+    url: '/api/supply/deletegoodorderbyid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteReturnOrder(id, params) {
+  return request({
+    url: '/api/supply/deletereturnorder?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
 
+export function deleteReturnOrderById(id, params) {
+  return request({
+    url: '/api/supply/deletereturnorderbyid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
 
+export function modefyReturnOrder(params) {
+  return request({
+    url: '/api/supply/modefyreturnorder',
+    method: 'get',
+    params: params
+  })
+}

src/views/layout/Layout.vue

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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -76,7 +76,7 @@
             </div>
           </div>
         </div>
-        <div class="row">
+        <div class="row" v-if="org_id != 10307">
           <div class="inline_block">
             入科方式：
             <div v-for="(item, index) in way_arr" class="under_line" v-if="receiverTreatmentAccess.way == item.id" style="width: 180px;text-align: left">
@@ -776,7 +776,7 @@
               </div>
             </div>
           </div>
-          <div class="row" style="margin-bottom:10px;">
+          <div class="row" style="margin-bottom:10px;" v-if="org_id != 10307" >
             <div class="inline_block">
               入科方式：
               <!--<check-box v-for="item, index in nutrition_arr" :key="index" :text="item.name" :checked="receiverTreatmentAccess.nutrition == item.id?true:false"></check-box>-->
@@ -817,7 +817,7 @@
               <!--平车-->
               <!--</div>-->
             </div>
-            <div class="inline_block" style="margin-left: 10px;">
+            <div class="inline_block" style="margin-left: 10px;" >
               诊断：
               <div class="under_line" style="width: 640px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;">
                 {{ patientInfo.diagnose }}
@@ -888,12 +888,12 @@
                 </tr>
               </template>
 
-              <tr>
+              <tr v-if="org_id != 10307">
                 <td colspan="7" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
                   透析后情况
                 </td>
               </tr>
-              <tr>
+              <tr v-if="org_id != 10307">
                 <td colspan="7">
                   <div class="row" style="padding: 2px 0;line-height:23px; display:flex;">
                     <div class="inline_block" style="flex:1;">
@@ -2020,6 +2020,7 @@ export default {
     }
   },
   created() {
+    console.log(this.org_id,'opop')
     this.way_arr = getDataConfig('hemodialysis', 'way')
     this.consciousness_arr = getDataConfig('hemodialysis', 'consciousness')
     this.appetite_arr = getDataConfig('hemodialysis', 'appetite')

src/xt_pages/supply/components/addGoodOrder.vue

@@ -71,9 +71,7 @@
             v-show="showTwo"
             >保存</el-button
           >
-          <el-button size="small" type="primary" @click="checkPurchaseOrder"
-            >审核</el-button
-          >
+          <el-button size="small" type="primary" @click="checkGoodOrder" >审核</el-button>
         </div>
       </div>
 
@@ -449,6 +447,9 @@ import {
   getPurchaseOrderInfo,
   addGoodOrder,
   updateGoodOrder,
+  checkGoodOrderById,
+  getGoodOrderCountList,
+  ModefySupplyWarehousing
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -527,6 +528,7 @@ export default {
       showTwo: false,
       warese_out_id: 0,
       return_remark: "",
+      is_warehouse:0
     };
   },
   methods: {
@@ -631,11 +633,7 @@ export default {
                 goodList[i].good_type_id = this.goodTypeList[y].type_name;
               }
             }
-            goodList[i].supply_name =
-              goodList[i].good_name +
-              " " +
-              goodList[i].specification_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 =
@@ -817,13 +815,12 @@ export default {
     count_arrearage() {
       this.payment = this.total_price - this.arrearage;
     },
-    checkPurchaseOrder(id, index) {
+    checkPurchaseOrder() {
       this.$confirm("是否审核?", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
@@ -949,19 +946,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-          console.log("stockIN2323322332322323", params);
-
-          addGoodOrder(
-            params,
-            this.supplier_name,
-            start,
-            this.arrearage,
-            this.payment,
-            warehousing_id,
-            this.number,
-            this.rate_of_concession,
-            this.discount_amount
-          ).then((response) => {
+          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("保存成功!");
@@ -977,6 +962,7 @@ export default {
               this.arrearage = warehouseOut.arrearage;
               this.supplier_name = warehouseOut.supplier_id;
               this.return_remake = warehouseOut.return_remake;
+              this.warehousing_id  = warehouseOut.warehousing_id
               this.start_time = this.getTimes(warehouseOut.document_date);
               for (let i = 0; i < orderInfo.length; i++) {
                 orderInfo[i].supply_count = orderInfo[i].count;
@@ -1042,7 +1028,6 @@ export default {
         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
@@ -1080,8 +1065,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remake,
           };
-          console.log("sotckind23232232323232323232", params);
-
+         
           updateGoodOrder(
             params,
             this.supplier_name,
@@ -1102,6 +1086,121 @@ export default {
         }
       });
     },
+    checkGoodOrder() {
+      var id = this.warese_out_id;
+      var warehousing_id = this.warehousing_id;
+      console.log("hhh2323232323232323",id,warehousing_id)
+      getGoodOrderCountList(id, warehousing_id).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("审核成功!");
+          this.is_check = 1
+          this.showOne = false;
+          this.showTwo = true;
+          this.showThree = true;
+          var purcaseOrder = response.data.data.purcaseOrder;
+          console.log("采购订单", purcaseOrder);
+
+          var goodOrder = response.data.data.goodOrder;
+          console.log("采购单", goodOrder);
+          var drugList = response.data.data.drugList;
+          console.log("druglist23323223", drugList);
+          var is_warehouse = 0;
+          for (let i = 0; i < purcaseOrder.length; i++) {
+            for (let j = 0; j < drugList.length; j++) {
+              if (purcaseOrder[i].is_source == 1) {
+                if (purcaseOrder[i].supply_unit == drugList[j].max_unit) {
+                  purcaseOrder[i].count =
+                    purcaseOrder[i].count * drugList[j].min_number;
+                }
+              }
+            }
+          }
+
+          for (let i = 0; i < goodOrder.length; i++) {
+            for (let j = 0; j < drugList.length; j++) {
+              if (goodOrder[i].is_source == 1) {
+                if (goodOrder[i].supply_unit == drugList[j].max_unit) {
+                  goodOrder[i].count =
+                    goodOrder[i].count * drugList[j].min_number;
+                }
+              }
+            }
+          }
+
+          let objInfo = {};
+          if (goodOrder.length > 0) {
+            goodOrder.forEach((item, index) => {
+              let { project_id } = item;
+              if (!objInfo[project_id]) {
+                objInfo[project_id] = {
+                  project_id,
+                  child: [],
+                  count: 0,
+                };
+              }
+            });
+            let newArr = Object.values(objInfo);
+
+            for (let i = 0; i < goodOrder.length; i++) {
+              for (let j = 0; j < newArr.length; j++) {
+                if (goodOrder[i].project_id == newArr[j].project_id) {
+                  newArr[j].child.push(goodOrder[i]);
+                }
+              }
+            }
+            console.log("newAr2332232323", newArr);
+
+            for (let i = 0; i < newArr.length; i++) {
+              for (let j = 0; j < newArr[i].child.length; j++) {
+                newArr[i].count += newArr[i].child[j].count;
+              }
+            }
+
+            var arr = [];
+            var total = 0;
+            var str = "";
+
+            //如果采购单有数据，则需要比较数量
+            if (newArr.length > 0) {
+              for (let i = 0; i < purcaseOrder.length; i++) {
+                for (let j = 0; j < newArr.length; j++) {
+                  if (purcaseOrder[i].project_id == newArr[j].project_id) {
+                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据,部分入库
+                    if (purcaseOrder[i].count > newArr[j].count) {
+                      arr.push(purcaseOrder[i].project_id);
+                    }
+                  }
+                }
+              }
+              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
+
+              if (arr.length == 0) {
+                this.is_warehouse = 1;
+                this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
+              }
+
+              //部分入库
+              if (total != goodOrder.length) {
+                //修改订购单
+                this.is_warehouse = 3;
+                this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
+              }
+            }
+          }
+        }
+      });
+    },
+    ModefySupplyWarehousing(is_warehouse, warehousing_id) {
+      var params = {
+        is_warehouse: this.is_warehouse,
+        warehousing_id: this.warehousing_id,
+      };
+      ModefySupplyWarehousing(params).then((response) => {
+        if (response.data.state == 1) {
+          var msg = response.data.data.msg;
+        }
+      });
+    },
   },
   created() {
     const tempObj = {};

src/xt_pages/supply/components/addGoodReturn.vue

@@ -40,22 +40,8 @@
             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>单据编码:{{ number }}</span>
         </div>
         <div>
@@ -69,11 +55,11 @@
           <el-button
             size="small"
             type="primary"
-            @click=""
+            @click="updateGoodReturn"
             v-show="showTwo"
             >保存</el-button
           >
-          <el-button size="small" type="primary" @click="updatePurchaseOrder">审核</el-button>
+          <el-button size="small" type="primary" @click="checkReturnOrder">审核</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> -->
@@ -133,6 +119,7 @@
                 :disabled="true"
                 placeholder="商品类别"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="规格&单位" align="center" width="200px">
@@ -143,6 +130,7 @@
                 :disabled="true"
                 placeholder="规格&单位"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -162,12 +150,12 @@
                   placeholder="请选择"
                   :disabled="disabled"
                 >
-                  <!-- <el-option
-                            v-for="(item,index) in scope.row.unitList"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.name">
-                        </el-option> -->
+                  <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>
@@ -179,16 +167,18 @@
                 style="width: 100px"
                 :disabled="true"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="可退数量" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.supply_specification_name"
+                v-model="scope.row.count"
                 style="width: 150px"
                 :disabled="true"
                 placeholder="可退数量"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="数量" align="center" width="120px">
@@ -217,6 +207,7 @@
                 :disabled="disabled"
                 placeholder="请输入采购单价"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -244,6 +235,7 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -254,16 +246,18 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </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.good_number"
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -275,6 +269,7 @@
                 :disabled="disabled"
                 placeholder="请输入备注"
               ></el-input>
+               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -376,6 +371,8 @@ import {
   getInitOrder,
   getGoodOrderDetail,
   saveGoodReturnOrder,
+  checkReturnOrder,
+  updateGoodReturn
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -386,7 +383,7 @@ export default {
     return {
       tipsInfo: "",
       crumbs: [
-        { path: false, name: "购货单" },
+        { path: false, name: "退货单" },
         { path: "/good/return/add", name: "新增退货单" },
       ],
       showTwo: false,
@@ -435,6 +432,7 @@ export default {
       is_check: 0,
       dialogVisible: false,
       return_remark: "",
+      warehouse_out_id:0,
     };
   },
   methods: {
@@ -603,6 +601,7 @@ export default {
       tempObj["supply_type"] = "";
       tempObj["supply_specification_name"] = "";
       tempObj["supply_total"] = "";
+      tempObj["count"] = "";
       tempObj["supply_count"] = "";
       tempObj["supply_price"] = "";
       tempObj["supply_total_price"] = "";
@@ -614,6 +613,11 @@ export default {
       tempObj["project_id"] = 0;
       tempObj["supply_unit"] = "";
       tempObj["order_number"] = ""
+      tempObj["supply_batch_number"] = ""
+      tempObj["supply_product_date"] = ""
+      tempObj["supply_expiry_date"] = ""
+      tempObj["warehousing_id"] =0
+      tempObj["warehouse_info_id"] =0
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -624,12 +628,6 @@ export default {
         this.recordInfo.tableList.splice(index, 1);
       }
     },
-
-    changeTypeName() {},
-    startTimeChange() {},
-    endTimeChange() {},
-    search() {},
-
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
       var max_str = "";
@@ -678,53 +676,7 @@ export default {
       }
       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++) {
@@ -795,6 +747,7 @@ export default {
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
             orderInfo[i].supply_count = orderInfo[i].count;
+            orderInfo[i].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;
@@ -802,15 +755,12 @@ export default {
             orderInfo[i].supply_unit = orderInfo[i].supply_unit;
             orderInfo[i].order_number = orderInfo[i].order_number;
             orderInfo[i].good_number = orderInfo[i].good_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
-            );
+            orderInfo[i].supply_total_price = ( orderInfo[i].count * orderInfo[i].price).toFixed(2);
+            orderInfo[i].supply_expiry_date = orderInfo[i].supply_expiry_date;
+            orderInfo[i].supply_product_date = orderInfo[i].supply_product_date;
+            orderInfo[i].supply_batch_number = orderInfo[i].supply_batch_number
+            orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
+            orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
             if (orderInfo[i].is_source == 1) {
               for (let j = 0; j < drugList.length; j++) {
                 if (orderInfo[i].project_id == drugList[j].id) {
@@ -865,6 +815,7 @@ export default {
                 this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name;
               }
             }
+          } 
            var params = {
             stockIn:this.recordInfo.tableList,
             return_marke:this.return_remark,
@@ -880,6 +831,7 @@ export default {
                 var warehouseCancel = response.data.data.warehouseCancel
                 var out = response.data.data.cancelOrder
                 this.id = out.id
+                this.warehouse_out_id = out.warehouse_out_id
                 this.supplier_name = out.supplier_id
                 this.rate_of_concession = out.rate_of_concession
                 this.discount_amount = out.discount_amount
@@ -929,9 +881,59 @@ export default {
                 }
              }
            })
+          
+        }
+      })
+    },
+    updateGoodReturn(){
+      var warehouse_out_id = this.id;
+      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_price = this.recordInfo.tableList[i].supply_price.toString()
+            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.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
+                }
+
+            }
           }
+          var params = {
+            stockIn:this.recordInfo.tableList,
+            return_marke:this.return_remark,
+          }
+          console.log("start_time232233232",this.start_time)
+          console.log("arrage2323322323",params)
+          updateGoodReturn(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name,this.number).then(response=>{
+            if(response.data.state == 1){
+               var msg = response.data.msg
+               this.loading = false
+               this.$message.success("保存成功!")
+            }
+          })
         }
       })
+    },
+    checkReturnOrder(){
+      this.loading = true
+     var params = {
+       warehouse_out_id:this.warehouse_out_id,
+       id:this.id,
+     }
+     checkReturnOrder(params).then(response=>{
+       if(response.data.state == 1){
+        this.loading = false
+        var msg = response.data.data.msg
+        this.$message.success("保存成功!")
+       }
+     })
     }
    
   },
@@ -954,6 +956,12 @@ export default {
     tempObj["project_id"] = 0;
     tempObj["supply_unit"] = "";
     tempObj["order_number"] = ""
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["warehousing_id"] =0
+    tempObj["warehouse_info_id"] =0
+    tempObj["count"] = "";
     this.recordInfo.tableList.push(tempObj);
     console.log("即哪里地方2",this.recordInfo.tableList)
     this.getInitOrder();

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -211,19 +211,19 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="购货单价" align="center" width="140px">
+          <el-table-column label="采购单价" align="center" width="140px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.supply_price"
                 style="width: 80px"
                 :disabled="disabled"
-                 placeholder="请输入购货单价"
+                 placeholder="请输入采购单价"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
-          <el-table-column label="购货金额" align="center" width="120px">
+          <el-table-column label="采购金额" align="center" width="120px">
             <template slot-scope="scope">
               {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
             </template>
@@ -369,8 +369,8 @@ export default {
     return {
       Reviewed:false,
       crumbs: [
-        { path: false, name: "购货订单" },
-        { path: "/spply/query", name: "新增购货订单" },
+        { path: false, name: "采购订单" },
+        { path: "/spply/query", name: "新增采购订单" },
       ],
       showTwo: true,
       showOne: false,

src/xt_pages/supply/components/addSupply.vue

@@ -11,51 +11,61 @@
         ref="supplier"
       >
         <el-row>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="供应商编码" prop="supplierCode">
               <el-input v-model="supplier.supplierCode"></el-input>
             </el-form-item>
           </el-col>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="供应商名称" prop="supplierName">
               <el-input v-model="supplier.supplierName"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="供应商类别" prop="supplierType">
               <!-- <el-input v-model="supplier.type"></el-input> -->
-              <el-autocomplete
+              <!-- <el-autocomplete
                 v-model="supplier.supplierType"
                 :fetch-suggestions="querySearchAsync"
                 @select="handleSelect"
-              ></el-autocomplete>
+              ></el-autocomplete> -->
+
+              <el-select v-model="supplier.supplierType" @select="handleSelect">
+                <el-option
+                  v-for="item in supplierType"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="增值税税率" prop="vatRate">
               <el-input
                 v-model="supplier.vatRate"
                 @keyup.native="supplier.vatRate = oninput(supplier.vatRate)"
-              ></el-input>
+              ></el-input>%
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="纳税人识别号" prop="number">
               <el-input v-model="supplier.number"></el-input>
             </el-form-item>
           </el-col>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="开户银行" prop="bank">
               <el-input v-model="supplier.bank"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col span="6">
+          <el-col :span="6">
             <el-form-item label="银行账号" prop="bankAccount">
               <el-input v-model="supplier.bankAccount"></el-input>
             </el-form-item>
@@ -91,7 +101,7 @@
                         {
                           required: 'true',
                           message: '请输入主要联系人',
-                          trigger: ['blur', 'change'],
+                          trigger: ['blur'],
                         },
                       ]
                     : null
@@ -227,6 +237,7 @@ export default {
       supplier_ids: "",
       title: "",
       Template,
+      supplierType: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       list: ["001", "002"],
       // 表单验证规则
@@ -297,8 +308,10 @@ export default {
         this.initSupplierData();
         this.show_type = 1;
         this.title = "新增供应商";
+        this.getsupplytype();
         this.dialogVisible = true;
       } else if (type == 2) {
+        this.getsupplytype();
         // console.log(data,'oop')
         this.show_type = 2;
         this.supplier_ids = data.ID;
@@ -306,6 +319,7 @@ export default {
         this.supplier.supplierCode = data.SupplierCode;
         this.supplier.supplierName = data.SupplierName;
         this.supplier.supplierType = data.SupplierType;
+
         this.supplier.vatRate = data.VatRate;
         this.supplier.number = data.Number;
         this.supplier.bank = data.Bank;
@@ -363,35 +377,17 @@ export default {
       });
     },
 
-    querySearchAsync(queryString, cb) {
-      clearTimeout(this.timeout);
-      var results = [];
-      if (queryString == "") {
-        cb(results);
-      } else {
-        // 获取供应商类别接口
-        getsupplytype()
-          .then((res) => {
-            if (res.status == 200) {
-              var result = res.data.data.list;
-              //远程搜索需要的数组
-              for (let i = 0; i < result.length; i++) {
-                const element = result[i];
-                results.push({
-                  value: element.name,
-                  name: element.value,
-                });
-              }
-              cb(results);
-            } else {
-              results = [];
-              cb(results);
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-          });
-      }
+    getsupplytype() {
+      // 获取供应商类别接口
+      getsupplytype()
+        .then((res) => {
+          if (res.status == 200) {
+            this.supplierType = res.data.data.list;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
 
     handleSelect(item) {
@@ -429,11 +425,11 @@ export default {
                 };
                 savesupply(params).then((res) => {
                   if (res.data.state == 1) {
-                    this.$message.success("修改成功");
+                    this.$message.success("新增成功");
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("修改失败");
+                    this.$message.error("新增失败");
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -466,7 +462,7 @@ export default {
                 let params = {
                   suppliercode: this.supplier.supplierCode || "",
                   suppliername: this.supplier.supplierName || "",
-                  id: this.supplier.id|| 0,
+                  id: this.supplier_ids || 0,
                   suppliertype: this.supplier.supplierType || "",
                   vatrate: this.supplier.vatRate || 0,
                   number: this.supplier.number || "",
@@ -511,23 +507,17 @@ export default {
           if (this.recordInfo.contacts.length == 0) {
             this.recordInfo.contacts = [{}];
             this.recordInfo.contacts[0].is_first = data.value;
-          } else if (this.recordInfo.contacts.length == 1) {
-            let val = res.data.data.contact[0];
-            this.recordInfo.contacts[0].is_first = data.value;
-            this.recordInfo.contacts[0] = {
-              id: val.id,
-              name: val.name,
-              address: val.address,
-              phone: val.phone,
-            };
-            this.$forceUpdate();
-          } else {
-            this.recordInfo.contacts.forEach((o) => {
-              if (o.isfirst == 0) {
-              } else if (o.isfirst == 1) {
-              }
-            });
           }
+          // else if (this.recordInfo.contacts.length == 1) {
+          //     let val = res.data.data.contact[0];
+          //     this.recordInfo.contacts[0].is_first = data.value;
+          //     this.recordInfo.contacts[0] = {
+          //       id: parseFloat(val.id),
+          //       name: val.name,
+          //       address: val.address,
+          //       phone: val.phone,
+          //     };
+          //   }
         }
       });
     },
@@ -639,6 +629,9 @@ export default {
     .el-autocomplete {
       width: 75% !important;
     }
+    .el-select.el-select--medium {
+      width: 70% !important;
+    }
   }
 }
 

src/xt_pages/supply/components/editGoodOrder.vue

@@ -448,6 +448,7 @@ import {
   MofyGoodOrder,
   UpdateSupplyWahouseingInfo,
   getSupplyWarehouseOutById,
+  deleteGoodOrderById
 } from "@/api/supply";
 
 export default {
@@ -711,12 +712,39 @@ export default {
       tempObj["good_number"] = "";
       this.recordInfo.tableList.push(tempObj);
     },
-    handleDelete: function (index, row) {
-      if (this.recordInfo.tableList.length <= 1) {
+    handleDelete: function (index, row) { 
+      if(this.is_check == 1){
+        this.$message.error("已审核单据，不能删除!")
+        return false
+      }
+      if(row.id == 0){
+        if (this.recordInfo.tableList.length <= 1) {
         this.$message.error("只有一条记录的时候无法删除");
         return;
       } else {
         this.recordInfo.tableList.splice(index, 1);
+       }
+      }else{
+         const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除吗?', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteGoodOrderById(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+
+                this.recordInfo.tableList.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+        })
       }
     },
 
@@ -931,19 +959,10 @@ export default {
           var params = {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
-          };
-          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) => {
+          }
+          console.log("param23322332323",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("保存成功!");
@@ -1076,17 +1095,18 @@ export default {
       getSupplyWarehouseOutById(id).then((response) => {
         if (response.data.state == 1) {
           var cancelList = response.data.data.cancelList;
-          console.log("cancelList23232232323323223", cancelList);
+          console.log("退库单", cancelList);
            var drugList = response.data.data.drugList;
-          console.log("drugList233223232323232", drugList);
+          console.log("药品列表", drugList);
           var cancelOrderList = response.data.data.cancelOrderList;
-          console.log("cancelOrderList2323322322332", cancelOrderList);
+          console.log("退库单详情", cancelOrderList);
           var ids =""
           if(cancelList.length == 0){
             this.$router.push({ path: "/good/return/add?id=" + this.id+"&ids="+ids });
           }
           if (cancelList.length > 0) {
             var outList = response.data.data.outList;
+            console.log("购货单2322323",outList)
             for(let i=0;i<outList.length;i++){
               if(outList[i].is_source == 1){
                 for(let j=0;j<drugList.length;j++){
@@ -1103,13 +1123,17 @@ export default {
             for(let i=0;i<cancelOrderList.length;i++){
              if(cancelOrderList[i].is_source == 1){
                 for(let j=0;j<drugList.length;j++){
-                  if(cancelOrderList[i].supply_unit == drugList[j].max_unit){
-                    cancelOrderList[i].count = cancelOrderList[i].count * drugList[j].min_number
+                  if(cancelOrderList[i].project_id == drugList[j].id){
+                    if(cancelOrderList[i].supply_unit == drugList[j].max_unit){
+                      cancelOrderList[i].count = cancelOrderList[i].count * drugList[j].min_number
+                    }
                   }
                  }
                }
             }
-            
+
+            console.log("数据变了后23323233",outList)
+           
             let objInfo = {};
             if(cancelOrderList.length >0){
               cancelOrderList.forEach((item, index) => {
@@ -1123,15 +1147,22 @@ export default {
                 }
               });
               let newArr = Object.values(objInfo)
-
-              console.log("outList2332232332", outList)
+              console.log("最好的输3233232323323223", newArr)
+              console.log("数据变了后23323233",cancelOrderList)
               for (let i = 0; i < cancelOrderList.length; i++) {
                 for (let j = 0; j < newArr.length; j++) {
                   if (cancelOrderList[i].project_id == newArr[j].project_id) {
                     newArr[j].child.push(cancelOrderList[i])
                 }
               }
-              console.log("newAr2332232323", newArr)
+              
+             } 
+
+            for (let i = 0; i < newArr.length; i++) {
+              for (let j = 0; j < newArr[i].child.length; j++) {
+                newArr[i].count += newArr[i].child[j].count;
+              }
+            }
            
             var arr = []
             var total = 0;
@@ -1143,7 +1174,7 @@ export default {
                   if (outList[i].project_id == newArr[j].project_id) {
                     //根据商品ID比较数量大小,把数量不足的商品ID储存,表示退货单的数量未满足采购单的数据，可以继续生成退货单
                     if (outList[i].count > newArr[j].count) {
-                      arr.push(outList[i].project_id);
+                       arr.push(outList[i].project_id);
                     }
                   }
                 }
@@ -1151,16 +1182,16 @@ export default {
               //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
 
               if (arr.length == 0) {
-                this.$message.error("该订单已全部生成采购单，请知悉!");
-                return;
+                this.$message.error("该订单已全部生成退库单，请知悉!");
+                return 
               }
-
-              if (total != cancelOrderList.length) {
+              console.log("arr23323232232323",arr)
+              if (arr.length > 0) {
                 str = arr.join(",");
                 this.$router.push({ path: "/good/return/edit?id=" + id + "&ids=" + str});
               }
              }
-            }
+         
           }
          }
         }
@@ -1180,6 +1211,7 @@ export default {
           var msg = response.data.data.msg;
           if (msg == 1) {
             this.$message.success("反审核成功!");
+            return 
           }
           if (msg == 2) {
             var cancelList = response.data.data.cancelList

src/xt_pages/supply/components/editGoodReturn.vue

@@ -60,7 +60,14 @@
         </div>
         <div>
           <el-button size="small" type="primary" @click="updateGoodReturn">保存</el-button>
-          <el-button size="small" type="primary" @click="updatePurchaseOrder">审核</el-button>
+          <el-button size="small" type="primary" @click="checkReturnOrder" v-if="is_check == 2">审核</el-button>
+          <el-button size="small" type="primary" @click="modefyReturnOrder" v-if="is_check == 1">反审核</el-button>
+          <el-button size="small" type="primary" @click="updateGoodReturn"
+            >保存</el-button
+          >
+          <el-button size="small" type="primary" @click="checkReturnOrder"
+            >审核</el-button
+          >
         </div>
       </div>
 
@@ -68,8 +75,8 @@
         <el-table
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266',
           }"
           :data="recordInfo.tableList"
           :class="signAndWeighBoxPatients"
@@ -130,21 +137,30 @@
             </template>
           </el-table-column>
 
-        <el-table-column label="单位" align="center" width="120px">
+          <el-table-column label="单位" align="center" width="120px">
             <template slot="header" slot-scope="scope">
-                <span>单位<span style="color: red">*</span></span>
+              <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
+              <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>  
+              </el-form-item>
             </template>
           </el-table-column>
           <el-table-column label="可用库存" align="center" width="130px">
@@ -159,7 +175,7 @@
           <el-table-column label="可退数量" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.supply_specification_name"
+                v-model="scope.row.count"
                 style="width: 150px"
                 :disabled="true"
               ></el-input>
@@ -168,7 +184,6 @@
           <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
@@ -233,7 +248,7 @@
             </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.good_number"
@@ -254,26 +269,43 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" width="150px" fixed="right">
+          <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
+                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-column>
         </el-table>
       </el-form>
       <div style="margin-top: 10px">
@@ -285,11 +317,14 @@
         >
         </el-input>
       </div>
+      <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
       <div style="margin-top: 10px">
         <span
           >优惠率:<el-input
             style="width: 100px"
             v-model="rate_of_concession"
+            @input="addressChange"
+            placeholder="请输入优惠率"
           ></el-input
           >%</span
         >
@@ -298,6 +333,8 @@
           >优惠金额:<el-input
             style="width: 100px"
             v-model="discount_amount"
+            @input="count_discount"
+            placeholder="请输入优惠金额"
           ></el-input
         ></span>
 
@@ -305,6 +342,8 @@
           >本次付款:<el-input
             style="width: 100px"
             v-model="payment"
+            @input="count_payment"
+            placeholder="请输入本次付款"
           ></el-input
         ></span>
 
@@ -312,6 +351,8 @@
           >本次欠款:<el-input
             style="width: 100px"
             v-model="arrearage"
+            @input="count_arrearage"
+            placeholder="请输入本次欠款"
           ></el-input
         ></span>
       </div>
@@ -337,7 +378,10 @@ import { uParseTime } from "@/utils/tools";
 import {
   getInitOrder,
   getGoodReturnDetail,
-  updateGoodReturn
+  updateGoodReturn,
+  checkReturnOrder,
+  deleteReturnOrderById,
+  modefyReturnOrder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -346,9 +390,9 @@ export default {
   },
   data() {
     return {
-      tipsInfo:"",
+      tipsInfo: "",
       crumbs: [
-        { path: false, name: "购货单" },
+        { path: false, name: "退货单" },
         { path: "/good/return/add", name: "新增退货单" },
       ],
       showTwo: true,
@@ -380,8 +424,8 @@ export default {
       supplier_name: "",
       supplyList: [],
       rate_of_concession: "",
-      arrearage:"",
-      payment:"",
+      arrearage: "",
+      payment: "",
       discount_amount: "",
       tableRules: {
         name: [{ required: true, message: "商品不能为空", trigger: "blur" }],
@@ -398,7 +442,8 @@ export default {
       disabled: false,
       is_check: 0,
       dialogVisible: false,
-      return_remark:"",
+      return_remark: "",
+      warehouse_out_id: 0,
     };
   },
   methods: {
@@ -577,22 +622,48 @@ export default {
       tempObj["is_total"] = 1;
       tempObj["project_id"] = 0;
       tempObj["supply_unit"] = "";
+      tempObj["supply_batch_number"] = ""
+      tempObj["supply_product_date"] = ""
+      tempObj["supply_expiry_date"] = ""
+      tempObj["warehousing_id"] =0
+      tempObj["warehouse_info_id"] =0
+      tempObj["count"] = ""
+
       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);
+      if(row.id == 0){
+        if (this.recordInfo.tableList.length <= 1) {
+          this.$message.error("只有一条记录的时候无法删除");
+          return;
+        } else {
+          this.recordInfo.tableList.splice(index, 1);
+        }
+      }
+      if(row.id >0){
+       if(this.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
+       }
+       this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          deleteReturnOrderById(val.id).then(response => {
+            if (response.data.state == 1) {
+                var msg = response.data.data.msg
+                this.recordInfo.tableList.splice(index, 1);
+                this.$message.success("删除成功")
+            } else {
+                this.$message.error("删除失败")
+            }
+          })
+        }).catch(() => {
+       })
       }
-    },
-
-    changeTypeName() {},
-    startTimeChange() {},
-    endTimeChange() {},
-    search() {},
 
+    },
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
       var max_str = "";
@@ -707,8 +778,34 @@ export default {
           this.recordInfo.tableList[i].supply_price *
           this.recordInfo.tableList[i].supply_count;
       }
+      this.total_price = total_price;
       return total_price.toFixed(2);
     },
+
+    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;
+    },
+    count_discount() {
+      this.rate_of_concession = (
+        this.discount_amount /
+        (this.total_price * 0.01)
+      ).toFixed(2);
+    },
+    count_payment() {
+      this.arrearage = this.total_price - this.payment;
+    },
+
+    count_arrearage() {
+      this.payment = this.total_price - this.arrearage;
+    },
+
     checkPurchaseOrder(id, index) {
       this.$confirm("是否审核?", {
         confirmButtonText: "确 定",
@@ -727,13 +824,15 @@ export default {
         })
         .catch(() => {});
     },
-    getGoodReturnDetail(){
-      
+   getGoodReturnDetail(){
+
       var id = this.$route.query.id
       getGoodReturnDetail(id).then(response=>{
         if(response.data.state == 1){
           var out = response.data.data.cancelDetail
           console.log("out23322323232323",out)
+          this.warehouse_out_id = out.warehouse_out_id
+          this.number = out.number
           this.is_check = out.is_check
           this.id = out.id
           this.supplier_name = out.supplier_id
@@ -743,12 +842,16 @@ export default {
           this.arrearage = out.arrearage
           this.start_time = this.getTimes(out.document_date)
           var orderInfo = response.data.data.orderCancelDetail
-          console.log("orderINFO233232232332",orderInfo)
+          if(out.is_check == 1){
+            this.disabled = true
+          }
+          console.log("退库单详情",orderInfo)
           var drugList = response.data.data.drugList
           var goodList = response.data.data.goodList
           for(let i=0;i< orderInfo.length;i++){
-              
+              orderInfo[i].id = orderInfo[i].id
               orderInfo[i].supply_count =  orderInfo[i].count
+              orderInfo[i].count = orderInfo[i].source_count
               orderInfo[i].supply_price =  orderInfo[i].price
               orderInfo[i].supply_remake =  orderInfo[i].remark
               orderInfo[i].type =  orderInfo[i].is_source
@@ -757,8 +860,8 @@ export default {
               orderInfo[i].order_number =  orderInfo[i].order_number
               orderInfo[i].good_number = orderInfo[i].good_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)
+              orderInfo[i].supply_expiry_date =  orderInfo[i].supply_expiry_date
+              orderInfo[i].supply_product_date = 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){
@@ -771,66 +874,133 @@ export default {
                       orderInfo[i].unitList = [{id:1,name:""}]
                       orderInfo[i].unitList[0].name = drugList[j].max_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
-        
+
+          this.recordInfo.tableList = [];
+          this.recordInfo.tableList = orderInfo;
         }
-      })  
+      });
     },
     toPrint() {
       var id = this.$route.query.id;
       this.$router.push({ path: "/purchase/order/print?&id=" + id });
     },
-    updateGoodReturn(){
-      var warehouse_out_id = this.$route.query.id;
-      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_price = this.recordInfo.tableList[i].supply_price.toString()
-            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.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
-                }
+    // updateGoodReturn() {
+    //   var warehouse_out_id = this.$route.query.id;
+    //   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_price = this.recordInfo.tableList[i].supply_price.toString()
+    //         this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
 
-            }
-          }
-          var params = {
-            "stockIn":this.recordInfo.tableList,
-            "return_marke":this.return_remark,
-          }
-          console.log("start_time232233232",this.start_time)
-          console.log("arrage2323322323",this.arrearage)
-          updateGoodReturn(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name,this.number).then(response=>{
-            if(response.data.state == 1){
-               var msg = response.data.msg
-               this.loading = false
-               this.$message.success("保存成功!")
-            }
-          })
-        }
-      })
-    }
+    //         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.$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_price =
+    //           this.recordInfo.tableList[i].supply_price.toString();
+    //         this.recordInfo.tableList[i].supply_total =
+    //           this.recordInfo.tableList[i].supply_total.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;
+    //           }
+    //         }
+    //       }
+    //       var params = {
+    //         stockIn:this.recordInfo.tableList,
+    //         return_marke:this.return_remark,
+    //       }
+    //       console.log("start_time232233232",this.start_time)
+    //       console.log("arrage2323322323",params)
+    //       updateGoodReturn(
+    //         params,
+    //         warehouse_out_id,
+    //         this.start_time,
+    //         this.rate_of_concession,
+    //         this.discount_amount,
+    //         this.arrearage,
+    //         this.payment,
+    //         this.supplier_name,
+    //         this.number
+    //       ).then((response) => {
+    //         if (response.data.state == 1) {
+    //           var msg = response.data.msg;
+    //           this.loading = false;
+    //           this.$message.success("保存成功!");
+    //         }
+    //       })
+    // },
+    checkReturnOrder(){
+      this.loading = true
+     var params = {
+       warehouse_out_id:this.warehouse_out_id,
+       id:this.id,
+     }
+     checkReturnOrder(params).then(response=>{
+       if(response.data.state == 1){
+        this.loading = false
+        var msg = response.data.data.msg
+        this.$message.success("保存成功!")
+       }
+     })
+    },
+    modefyReturnOrder(){
+      this.loading = true
+     var params = {
+       warehouse_out_id:this.warehouse_out_id,
+       id:this.id,
+     }
+     modefyReturnOrder(params).then(response=>{
+       if(response.data.state == 1){
+
+       }
+     })
+    },
+    checkReturnOrder() {
+      var params = {
+        warehouse_out_id: this.warehouse_out_id,
+        id: this.id,
+      };
+      checkReturnOrder(params).then((response) => {});
+    },
   },
   created() {
     const tempObj = {};
@@ -850,6 +1020,12 @@ export default {
     tempObj["is_total"] = 1;
     tempObj["project_id"] = 0;
     tempObj["supply_unit"] = "";
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["warehousing_id"] =0
+    tempObj["warehouse_info_id"] =0
+    tempObj["count"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     //获取购货单列表

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -374,6 +374,7 @@ import {
   getAllOrderCountList,
   getGoodOrderList,
   getReturnOrder,
+  deletePurchaseOrder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -383,8 +384,8 @@ export default {
   },
   data() {
     return {
-      content_2:"购货单",
-      content:"购货订单",
+      content_2:"采购单",
+      content:"采购订单",
       content_1:"已有以下关联数据,不能反审核",
       type:1,
       Reviewed: false,
@@ -630,12 +631,41 @@ export default {
       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);
+      if(this.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
       }
+      if(row.id == 0){
+        if (this.recordInfo.tableList.length <= 1) {
+          this.$message.error("只有一条记录的时候无法删除");
+          return;
+        } else {
+          this.recordInfo.tableList.splice(index, 1);
+        }
+      }else{
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除吗?', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deletePurchaseOrder(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+
+                this.recordInfo.tableList.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+        })
+        
+      }
+      
     },
 
     changeTypeName() {},
@@ -769,8 +799,7 @@ export default {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
@@ -882,9 +911,7 @@ export default {
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
-            this.$router.push({
-              path: "/good/order/add?id=" + id + "&ids=" + ids,
-            });
+            this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + ids});
           }
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {
@@ -958,7 +985,7 @@ export default {
                 return;
               }
 
-              if (total != goodOrder.length) {
+              if (arr.length >0) {
                 str = arr.join(",");
                 this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
               }

src/xt_pages/supply/goodreturn.vue

@@ -105,29 +105,29 @@
         </el-table-column>
         <el-table-column label="购货金额" align="center" width="200">
           <template slot-scope="scope">
-             <!-- <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span>  -->
+             <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPrice(scope.row.cancelOrder)}}</span> 
           </template>
         </el-table-column>
         <el-table-column label="优惠后金额" align="center" width="200">
          <template slot-scope="scope">
-           <!-- {{getAllCount(scope.row.orderInfo)}} -->
+          <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPrice(scope.row.cancelOrder) - scope.row.discount_amount}}</span> 
          </template>
        </el-table-column>
-        <el-table-column label="已退款" align="center" width="200">
+        <!-- <el-table-column label="已退款" align="center" width="200">
          <template slot-scope="scope">
-           <!-- {{getAllCount(scope.row.orderInfo)}} -->
+         
          </template>
-       </el-table-column>
+       </el-table-column> -->
        <el-table-column label="源数量" align="center" width="200">
          <template slot-scope="scope">
-           <!-- {{getAllCount(scope.row.orderInfo)}} -->
+           {{scope.row.source_count}}
          </template>
        </el-table-column>
 
-       <el-table-column label="退款状态" align="center" width="200">
+       <el-table-column label="付款状态" align="center" width="200">
          <template slot-scope="scope">
-           <span v-if="scope.row.is_check == 2">未审核</span>
-           <span v-if="scope.row.is_check == 1">已审核</span>
+           <!-- <span v-if="scope.row.is_check == 2">未审核</span>
+           <span v-if="scope.row.is_check == 1">已审核</span> -->
          </template>
        </el-table-column>
       
@@ -183,7 +183,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllGoodReturnOrderList} from "@/api/supply"
+import {getAllSupply,getAllGoodReturnOrderList,deleteReturnOrder} from "@/api/supply"
 import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
@@ -228,16 +228,16 @@ export default {
        this.$router.push({path:"/good/return/add"})
      },
      changeTypeName(){
-
+       this.getlist()
      },
      startTimeChange(){
-
+       this.getlist()
      },
      endTimeChange(){
-
+      this.getlist()
      },
      search(){
-
+      this.getlist()
      },
      handleSizeChange(val){
        this.limit = val
@@ -324,6 +324,32 @@ export default {
      },
      editGoodReturn(id){
        this.$router.push({path:"/good/return/edit?id="+id})
+     },
+     toClickOne(val,index){
+       if(val.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
+       }
+       if(val.cancelOut.length >0 ){
+         this.$message.error("已关联单据，不能删除!")
+         return false
+       }
+       this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          deleteReturnOrder(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() {

src/xt_pages/supply/supplyQuery.vue

@@ -180,7 +180,7 @@ export default {
       page: 1,
       limit: 10,
 
-      type_name: 0,
+      type_name: "请选择",
       crumbs: [
         { path: false, name: "采购管理" },
         { path: "/supply/good/order/query", name: "供应商管理" },
@@ -213,7 +213,7 @@ export default {
       };
       getexporthistory(params).then((res) => {
         if (res.data.state == 1) {
-          console.log(res.data.data.list, "res.data.data.list");
+
           this.tableList = res.data.data.list;
           this.total = res.data.data.total;
         }
@@ -225,7 +225,7 @@ export default {
         if (res.data.state == 1) {
           this.sType = res.data.data.list;
         }
-        console.log(res, "oo");
+
       });
     },