11月14日 库存扣减更新

src/api/supply.js

@@ -89,7 +89,7 @@ export function updateGoodOrder(data, supplier_name, start, arrearage, payment,
 }
 
 export function deletePurchaseOrder(id, params) {
-  console.log("id232323223",id)
+  console.log('id232323223', id)
   return request({
     url: '/api/supply/deletepurchorder?id=' + id,
     method: 'Get',
@@ -337,3 +337,4 @@ export function modefyReturnOrder(params) {
     params: params
   })
 }
+

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -65,16 +65,7 @@
           >打印</el-button
         >
       </template>
-      <template v-if="org_template_info.template_id == 46">
-        <el-button
-          :loading="loading"
-          size="small"
-          icon="el-icon-printer"
-          @click="printThisPage"
-          type="primary"
-          >打印</el-button
-        >
-      </template>
+   
       <template v-if="org_template_info.template_id == 5">
         <div>
           <el-button
@@ -623,6 +614,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 46">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -1271,7 +1272,8 @@ export default {
       } else if (
         this.org_template_info.template_id == 6 ||
         this.org_template_info.template_id == 10 ||
-        this.org_template_info.template_id == 11
+        this.org_template_info.template_id == 11 ||
+        this.org_template_info.template_id == 46
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/supply/components/addGoodOrder.vue

@@ -436,6 +436,7 @@
               v-model="arrearage"
               @input="count_arrearage"
               placeholder="请输入本次欠款"
+              :disabled="disabled"
             ></el-input
           ></span>
         </div>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -18,7 +18,6 @@
             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
-            @change="changeTypeName"
           >
             <el-option
               v-for="item in supplyList"
@@ -253,7 +252,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"
@@ -604,7 +603,7 @@ export default {
       tempObj["supply_type"] = "";
       tempObj["supply_specification_name"] = "";
       tempObj["supply_total"] = "";
-      tempObj["count"] = "";
+      tempObj["count"] = 0;
       tempObj["supply_count"] = "";
       tempObj["supply_price"] = "";
       tempObj["supply_total_price"] = "";
@@ -621,6 +620,8 @@ export default {
       tempObj["supply_expiry_date"] = ""
       tempObj["warehousing_id"] =0
       tempObj["warehouse_info_id"] =0
+      tempObj["good_number"] = ""
+      tempObj["min_price"] = "";
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -817,6 +818,13 @@ export default {
              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();
+            if(this.recordInfo.tableList[i].supply_product_date == ""){
+              console.log("进来3323232")
+              this.recordInfo.tableList[i].supply_product_date = 0
+            }
+            if(this.recordInfo.tableList[i].supply_expiry_date == ""){
+              this.recordInfo.tableList[i].supply_expiry_date = 0
+            }
             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;
@@ -824,13 +832,14 @@ export default {
               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("2323323232",this.start_time)
+           console.log("2323323232",params)
          
            saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
              if(response.data.state == 1){
@@ -971,7 +980,9 @@ export default {
     tempObj["supply_expiry_date"] = ""
     tempObj["warehousing_id"] =0
     tempObj["warehouse_info_id"] =0
-    tempObj["count"] = "";
+    tempObj["count"] = 0;
+    tempObj["good_number"] = ""
+    tempObj["min_price"] = "";
     this.recordInfo.tableList.push(tempObj);
     console.log("即哪里地方2",this.recordInfo.tableList)
     this.getInitOrder();
@@ -980,7 +991,7 @@ export default {
      //获取购货单列表
       this.getGoodOrderDetail();
     }
-
+    this.start_time = this.getTimes(new Date());
   },
 };
 </script>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -660,19 +660,11 @@ export default {
         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();
-            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();
+            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 ==
@@ -712,6 +704,7 @@ export default {
               this.recordInfo.tableList = [];
               this.return_remark = warehouseInfo.return_remake;
               var orderInfo = response.data.data.orderInfo;
+              console.log("orderINO23323332232323",orderInfo)
               for (let i = 0; i < orderInfo.length; i++) {
                 if (orderInfo[i].is_source == 1) {
                   for (let j = 0; j < this.drugList.length; j++) {
@@ -740,13 +733,15 @@ export default {
                 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].supply_specification_name = orderInfo[i].supply_specification_name
               }
 
               this.recordInfo.tableList = orderInfo;
+              console.log("orderInfo2332322323232332",orderInfo)
               for (let i = 0; i < orderInfo.length; i++) {
-                orderInfo[i].name = "";
-                orderInfo[i].supply_name = "";
-                orderInfo[i].supply_specification_name = "";
+                // orderInfo[i].name = "";
+                // orderInfo[i].supply_name = "";
+                // orderInfo[i].supply_specification_name = "";
                 if (orderInfo[i].is_source == 1) {
                   for (let j = 0; j < this.drugList.length; j++) {
                     if (orderInfo[i].project_id == this.drugList[j].id) {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -1060,8 +1060,9 @@ export default {
         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();
-
+        this.recordInfo.tableList[i].supply_total.toString();
+        this.recordInfo.tableList[i].min_price =
+        this.recordInfo.tableList[i].min_price.toString();
         for (let j = 0; j < this.manufactuerList.length; j++) {
           if (
             this.recordInfo.tableList[i].supply_manufacturer ==
@@ -1122,6 +1123,7 @@ export default {
           this.showOne = false;
           this.showTwo = true;
           this.showThree = true;
+          this.disabled = true
           var purcaseOrder = response.data.data.purcaseOrder;
           this.Reviewed = true;
           console.log("采购订单", purcaseOrder);
@@ -1359,6 +1361,8 @@ export default {
             this.$message.success("反审核成功!");
             this.disabled = false
             this.Reviewed = false
+            this.showOne = true
+            this.showTwo = false
             return
           }
           if (msg == 2) {

src/xt_pages/supply/components/editGoodReturn.vue

@@ -266,7 +266,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"
@@ -660,7 +660,8 @@ export default {
       tempObj["warehousing_id"] = 0;
       tempObj["warehouse_info_id"] = 0;
       tempObj["count"] = "";
-
+      tempObj["min_price"] = "";
+      tempObj["good_number"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -972,6 +973,8 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_marke: this.return_remark,
           };
+          console.log("parms32322332",params)
+         
           updateGoodReturn(
             params,
             warehouse_out_id,
@@ -1045,10 +1048,13 @@ export default {
     tempObj["warehousing_id"] = 0;
     tempObj["warehouse_info_id"] = 0;
     tempObj["count"] = "";
+    tempObj["min_price"] = "";
+    tempObj["good_number"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     //获取购货单列表
     this.getGoodReturnDetail();
+    this.start_time = this.getTimes(new Date());
   },
 };
 </script>

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -771,8 +771,8 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-         
-
+          console.log("哈哈哈哈哈哈",params)
+          
           updatePurchaseOrder(
             params,
             this.supplier_name,
@@ -860,6 +860,7 @@ export default {
           var drugList = response.data.data.baseList;
           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].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;

src/xt_pages/supply/goodreturn.vue

@@ -157,7 +157,7 @@
                 icon="el-icon-delete"
                 size="small"
                 type="danger"
-                @click="toClickOne(scope.row)"
+                @click="toClickOne(scope.row,scope.$index)"
               >删除
               </el-button>
           </template>
@@ -331,10 +331,10 @@ export default {
          this.$message.error("已审核单据，不能删除!")
          return false
        }
-       if(val.cancelOut.length >0 ){
-         this.$message.error("已关联单据，不能删除!")
-         return false
-       }
+      //  if(val.cancelOrder.length >0 ){
+      //    this.$message.error("已关联单据，不能删除!")
+      //    return false
+      //  }
        this.$confirm('确认删除吗?', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',