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

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

src/xt_pages/data/components/consumables.vue

@@ -334,6 +334,7 @@
               total:"",
               register_number:"",
               is_user:"2",
+              number:"",
             },
             isVisibility: false,
           }
@@ -568,15 +569,12 @@
               response.data.data.goodInfo.good_type_id;
 
 
-            this.goodInfo.goodInfoDialog.formValue.good_name =
-              response.data.data.goodInfo.good_name;
+            this.goodInfo.goodInfoDialog.formValue.good_name = response.data.data.goodInfo.good_name;
 
 
-            this.goodInfo.goodInfoDialog.formValue.pinyin =
-              response.data.data.goodInfo.pinyin;
+            this.goodInfo.goodInfoDialog.formValue.pinyin = response.data.data.goodInfo.pinyin;
 
-            this.goodInfo.goodInfoDialog.formValue.wubi =
-              response.data.data.goodInfo.wubi;
+            this.goodInfo.goodInfoDialog.formValue.wubi = response.data.data.goodInfo.wubi;
 
 
 
@@ -731,7 +729,8 @@
             this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
             this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
             this.goodInfo.goodInfoDialog.formValue.register_number = response.data.data.goodInfo.register_number
-
+            
+            this.goodInfo.goodInfoDialog.formValue.number = response.data.data.goodInfo.number
            
             this.goodInfo.goodInfoDialog.formValue.is_user = response.data.data.goodInfo.is_user.toString()
             

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -918,6 +918,12 @@
             v-if="org_template_info.template_id == 45"
           >
           </DialysisPrintOrderFortyFive>
+
+             <DialysisPrintOrderFortySix
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 46"
+          >
+          </DialysisPrintOrderFortySix>
         </div>
       </el-container>
     </div>
@@ -982,9 +988,11 @@ import DialysisPrintOrderFortyTwo from "./template/DialysisPrintOrderFortyTwo";
 import DialysisPrintOrderFortyThree from "./template/DialysisPrintOrderFortyThree";
 import DialysisPrintOrderFortyFour from "./template/DialysisPrintOrderFortyFour";
 import DialysisPrintOrderFortyFive from "./template/DialysisPrintOrderFortyFive";
+import DialysisPrintOrderFortySix from "./template/DialysisPrintOrderFortySix"
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFortySix,
     DialysisPrintOrderFortyFive,
     DialysisPrintOrderFortyFour,
     DialysisPrintOrderFortyThree,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -357,7 +357,7 @@
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                     <div class="inline_block" style="flex:1;">
-                      透析(滤)器：
+                      <span>透析(滤)器：</span> 
                       <div class="under_line" style="width: 100px;text-align: center">
                         {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
                         {{prescription.dialysis_dialyszers?prescription.dialysis_dialyszers:"/"}}

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -211,6 +211,10 @@
               </el-select>
              </el-form-item>
 
+            <el-form-item label="批准文号:" >
+              <el-input v-model="form.number" style="width:180px"></el-input>
+            </el-form-item>
+
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
@@ -383,6 +387,7 @@
           total:"",
           register_number:"",
           is_user:"2",
+          number:"",
         },
 
         rules: {
@@ -610,6 +615,7 @@
         form["total"] = this.form.total
         form["register_number"] = this.form.register_number
         form["is_user"] = this.form.is_user
+        form["number"] = this.form.number
 
         return form
       }, changeSelected: function(val) {

src/xt_pages/stock/stockQuery.vue

@@ -113,7 +113,7 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id ==10290 ">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10188 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id ==10290 ">
              <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info)}}
             </span>
@@ -124,7 +124,7 @@
       
         <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id == 10290">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10188 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id == 10290">
             {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
           </span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -528,7 +528,8 @@ export default {
       showTwo: false,
       warese_out_id: 0,
       return_remark: "",
-      is_warehouse:0
+      is_warehouse:0,
+      tableDataList:[]
     };
   },
   methods: {
@@ -645,7 +646,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;
@@ -815,23 +816,23 @@ export default {
     count_arrearage() {
       this.payment = this.total_price - this.arrearage;
     },
-    checkPurchaseOrder() {
-      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(() => {});
-    },
+    // checkPurchaseOrder() {
+    //   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(() => {});
+    // },
     getPurchaseOrderDetail() {
       var id = this.$route.query.id;
       var ids = this.$route.query.ids;
@@ -851,7 +852,6 @@ export default {
             orderInfo[i].supply_product_date = "";
             orderInfo[i].supply_expiry_date = "";
           }
-          console.log("drugli323322332", orderInfo);
           var drugList = response.data.data.baseList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
@@ -893,8 +893,10 @@ export default {
 
           this.recordInfo.tableList = [];
           this.recordInfo.tableList = orderInfo;
-
-          console.log("orderINFO23323232", this.recordInfo.tableList);
+          //用来判断是否删除了从采购订单的数据
+          this.tableDataList = []
+          this.tableDataList = orderInfo
+         
         }
       });
     },
@@ -910,9 +912,7 @@ export default {
       }
 
       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_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 =
@@ -942,6 +942,15 @@ export default {
         if (valid) {
           this.loading = true;
           var warehousing_id = this.$route.query.id;
+          //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
+        
+          if(this.tableDataList.length != this.recordInfo.tableList){
+             warehousing_id = 0
+             for(let i=0;i<this.recordInfo.tableList.length;i++){
+              this.recordInfo.tableList[i].id = 0
+              this.number = ""
+             }
+          }
           var params = {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
@@ -1089,7 +1098,7 @@ 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("审核成功!");
@@ -1098,12 +1107,9 @@ export default {
           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++) {
@@ -1173,17 +1179,17 @@ export default {
                 }
               }
               //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
-
+             console.log("审核长度2332322323323332",arr)
               if (arr.length == 0) {
                 this.is_warehouse = 1;
-                this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
+                this.ModefySupplyWarehousing(this.is_warehouse, warehousing_id);
               }
 
               //部分入库
-              if (total != goodOrder.length) {
+              if (arr.length > 0) {
                 //修改订购单
                 this.is_warehouse = 3;
-                this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
+                this.ModefySupplyWarehousing(this.is_warehouse, warehousing_id);
               }
             }
           }

src/xt_pages/supply/components/addGoodReturn.vue

@@ -537,7 +537,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;
@@ -746,6 +746,7 @@ export default {
           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].count
             orderInfo[i].supply_price = orderInfo[i].price;

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -74,9 +74,16 @@
             size="small"
             type="primary"
             @click="checkPurchaseOrder"
-            v-show="showOne"
-            >审核</el-button
-          >
+            v-show="showOne">审核
+         </el-button>
+
+         <!-- <el-button
+            size="small"
+            type="primary"
+            @click="checkReturnOrder"
+            v-if="is_check == 1">反审核
+         </el-button> -->
+         
           <el-button
             size="small"
             type="primary"
@@ -97,10 +104,10 @@
           :data="recordInfo.tableList"
           :class="signAndWeighBoxPatients"
           border
-          style="width: 100%"
+          style="width:100%"
           max-height="450"
         >
-          <el-table-column align="center" width="200px">
+          <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
               <span>商品<span style="color: red">*</span></span>
             </template>
@@ -111,7 +118,7 @@
               >
                 <el-select
                   v-model="scope.row.name"
-                  style="width: 160px"
+                  style="width: 160"
                   filterable
                   placeholder="请选择商品"
                   @change="changeName"
@@ -129,7 +136,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="150px">
+          <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
               <span>商品类别</span>
             </template>
@@ -143,7 +150,7 @@
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
-          <el-table-column label="规格&单位" align="center" width="200px">
+          <el-table-column label="规格&单位" align="center" width="200s">
             <template slot-scope="scope">
               <el-input
                 placeholder="规格&单位"
@@ -340,6 +347,7 @@
             style="width: 150px"
             v-model="discount_amount"
             placeholder="请输入优惠金额"
+            @input="count_discount"
           ></el-input
         ></span>
       </div>
@@ -357,6 +365,7 @@ import {
   savePurchaseOrder,
   updatePurchaseOrder,
   checkPurchaseOrder,
+  getReturnOrder
 } from "@/api/supply";
 import { getDataConfig } from "@/utils/data";
 export default {
@@ -427,6 +436,7 @@ export default {
       goodList: [{ id: 1, name: "" }],
       total_price: 0,
       return_remark:"",
+      is_check:2,
     };
   },
   methods: {
@@ -507,7 +517,7 @@ export default {
         goodList[i].supply_count = ""
         goodList[i].supply_total_price = ""
         goodList[i].supply_manufacturer = goodList[i].manufacturer
-        goodList[i].supply_license_number = ""
+        goodList[i].supply_license_number = goodList[i].number
         goodList[i].supply_remake = ""
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
@@ -519,7 +529,7 @@ export default {
         this.tabList.push(goodList[i])
         }
         this.goodList = goodList
-        console.log(this.goodList,'oo')
+        
     } 
     })
 },
@@ -631,7 +641,7 @@ export default {
             return_remake:this.return_remark,
           };
 
-          console.log("params23322323", params);
+         
           savePurchaseOrder(
             params,
             this.supplier_name,
@@ -645,8 +655,10 @@ export default {
               this.loading = false;
               this.$message.success("保存成功!");
               var warehouseInfo = response.data.data.warehouseInfo;
+              this.is_check = warehouseInfo.is_check
               if(warehouseInfo.is_check == 1){
                 this.Reviewed = true
+               
               }
               this.number = warehouseInfo.number;
               this.id = warehouseInfo.id;
@@ -682,7 +694,7 @@ export default {
                 orderInfo[i].project_id = orderInfo[i].project_id;
                 orderInfo[i].supply_unit = orderInfo[i].supply_unit;
               }
-              console.log("orderINFO23323232", orderInfo);
+            
               this.recordInfo.tableList = orderInfo;
               for(let i=0;i<orderInfo.length;i++){
                  orderInfo[i].name = ""
@@ -716,7 +728,7 @@ export default {
       var min_str = "";
       if (arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].stock_max_number);
+          total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number);
         }
       }
       if (total < min_number) {
@@ -797,7 +809,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake:this.return_remark,
           };
-          console.log("params23232233223", params);
+         
 
           updatePurchaseOrder(
             params,
@@ -827,6 +839,12 @@ export default {
       }
       this.total_price = total_price;
       return total_price.toFixed(2);
+    },
+     count_discount() {
+      this.rate_of_concession = (
+        this.discount_amount /
+        (this.total_price * 0.01)
+      ).toFixed(2);
     },
     checkPurchaseOrder(id, index) {
       this.$confirm("是否审核?", {
@@ -838,6 +856,7 @@ export default {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
+              this.is_check = info.is_check
               this.disabled = true;
               this.$message.success("审核成功!");
               this.Reviewed = true
@@ -863,6 +882,18 @@ export default {
       }
       this.discount_amount = discount_amount;
     },
+    checkReturnOrder() {
+      var id = this.id;
+      getReturnOrder(id).then((response) => {
+        if (response.data.state == 1) {
+          var msg = response.data.data.msg;
+          this.disabled = false;
+          this.showOne = true
+          this.is_check =2 
+          this.$message.success("反审核成功!");
+        }
+      });
+    },
   },
 
   created() {
@@ -920,6 +951,11 @@ export default {
   transform: translateX(-50%);
   top: 30%;
 }
+
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+width:10px;
+height:10px;
+}
 </style>
 
 <style>

src/xt_pages/supply/components/addSupply.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="35%">
+  <el-dialog :title="title" :visible.sync="dialogVisible" width="40%" :show-close="false">
     <!-- :before-close="handleClose" 如需要可添加进上方 -->
     <div>
       <el-form
@@ -32,11 +32,14 @@
                 @select="handleSelect"
               ></el-autocomplete> -->
 
-              <el-select v-model="supplier.supplierType" @select="handleSelect">
+              <el-select
+                v-model="supplier.supplierType"
+                @select="handleSelect"
+              >
                 <el-option
                   v-for="item in supplierType"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 >
                 </el-option>
@@ -87,7 +90,7 @@
           max-height="450"
         >
           <!-- 联系人填写 -->
-          <el-table-column label="联系人" align="center" width="110px">
+          <el-table-column label="联系人" align="center" width="130">
             <template slot="header" slot-scope="scope">
               <span>联系人<span style="color: red">*</span></span>
             </template>
@@ -109,17 +112,17 @@
               >
                 <el-input
                   v-model="scope.row.name"
-                  style="width: 80px; margin-top: 3px"
+                  style="width: 100px; margin-top: 3px"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           <!-- 手机填写 -->
-          <el-table-column label="手机" align="center" width="100px">
+          <el-table-column label="手机" align="center" width="150">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.phone"
-                style="width: 80px"
+                style="width: 120px"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -127,22 +130,22 @@
           <!-- id填写======================================================= -->
           <el-table-column label="id" v-if="false">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.id" style="width: 80px"></el-input>
+              <el-input v-model="scope.row.id" style="width: 100px"></el-input>
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <!-- 联系地址填写 -->
-          <el-table-column label="联系地址" align="center" width="130px">
+          <el-table-column label="联系地址" align="center" width="150">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.address"
-                style="width: 115px"
+                style="width: 120px"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <!-- 首要联系人填写 -->
-          <el-table-column align="center" width="100px">
+          <el-table-column align="center" width="130px">
             <template slot="header" slot-scope="scope">
               <span>首要联系人<span style="color: red">*</span></span>
             </template>
@@ -151,8 +154,7 @@
                 <!-- :prop="'contacts.' + scope.$index + '.name'"  如需添加可在上方标签加入 -->
                 <el-select
                   v-model="scope.row.is_first"
-                  style="width: 90px"
-                  placeholder="请选择"
+                  style="width: 110px"
                   @change="changeName($event, scope)"
                 >
                   <el-option
@@ -170,7 +172,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="120px"
+            width="150px"
             fixed="right"
           >
             <template slot-scope="scope">
@@ -181,7 +183,6 @@
                 placement="top"
               >
                 <el-button
-                  class="tablebtn"
                   size="mini"
                   type="primary"
                   icon="el-icon-circle-plus-outline"
@@ -196,7 +197,6 @@
                 placement="top"
               >
                 <el-button
-                  class="tablebtn"
                   size="mini"
                   type="danger"
                   icon="el-icon-delete"
@@ -287,7 +287,7 @@ export default {
       supplier: {
         supplierName: "",
         supplierCode: "gsy001",
-        supplierType: 0,
+        supplierType: "请选择类别",
         vatRate: 0,
         number: "",
         bank: "",
@@ -429,7 +429,7 @@ export default {
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("新增失败");
+                    this.$message.error("新增失败："+res.data.msg);
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -477,7 +477,7 @@ export default {
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("修改失败");
+                    this.$message.error("修改失败："+res.data.msg);
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -571,8 +571,8 @@ export default {
         }
       } else if (this.show_type == 2) {
         delcontactone(params).then((res) => {
-          if (res.data.data.list == "删除成功") {
-            this.$message.success(res.data.data.list);
+          if (res.data.state == 1) {
+            this.$message.success("删除成功");
             this.getcontacts(this.supplier_ids);
           } else {
             this.$message.error(res.data.data.list);
@@ -630,7 +630,7 @@ export default {
       width: 75% !important;
     }
     .el-select.el-select--medium {
-      width: 70% !important;
+      width: 85% !important;
     }
   }
 }
@@ -655,4 +655,12 @@ export default {
 /deep/ .el-form-item__error {
   // display: none !important;
 }
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+/deep/ .el-table__fixed-right{
+  bottom: 0 !important;
+}
 </style>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -12,12 +12,13 @@
           align-items: center;
         "
       >
-        <div>
+        <div style="display: flex;">
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
+            :disabled="disabled"
           >
             <el-option
               v-for="item in supplyList"
@@ -39,24 +40,14 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :disabled="disabled"
           ></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>
+        <div style="display: flex;" >
           <el-button size="small" type="primary" @click="updateGoodOrder"
             >保存</el-button
           >
@@ -213,6 +204,7 @@
                   placeholder="选择日期时间"
                   format="yyyy-MM-dd"
                   value-format="yyyy-MM-dd"
+                  :disabled="disabled"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -262,6 +254,7 @@
           <el-table-column label="采购金额" align="center" width="120px">
             <template slot-scope="scope">
               {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="生产日期" align="center" width="200px">
@@ -272,6 +265,7 @@
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.supply_product_date'"
                 :rules="tableRules.supply_product_date"
+
               >
                 <el-date-picker
                   prefix-icon="el-icon-date"
@@ -281,6 +275,7 @@
                   placeholder="选择日期时间"
                   format="yyyy-MM-dd"
                   value-format="yyyy-MM-dd"
+                  :disabled="disabled"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -384,9 +379,17 @@
             :rows="2"
             placeholder="备注信息"
             v-model="return_remark"
+           :disabled="disabled"
           >
           </el-input>
         </div>
+        <!-- 审核水印 -->
+        <img
+          src="@/assets/purchase/Reviewed.png"
+          alt="正在加载..."
+          class="reviewImg"
+          v-show="Reviewed == true"
+        />
       </el-form>
       <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
       <div style="margin-top: 10px">
@@ -396,6 +399,7 @@
             v-model="rate_of_concession"
             @input="addressChange"
             placeholder="请输入优惠率"
+            :disabled="disabled"
           ></el-input
           >%</span
         >
@@ -406,6 +410,7 @@
             v-model="discount_amount"
             @input="count_discount"
             placeholder="请输入优惠金额"
+            :disabled="disabled"
           ></el-input
         ></span>
 
@@ -415,6 +420,7 @@
             v-model="payment"
             @input="count_payment"
             placeholder="请输入本次付款"
+            :disabled="disabled"
           ></el-input
         ></span>
 
@@ -424,10 +430,10 @@
             v-model="arrearage"
             @input="count_arrearage"
             placeholder="请输入本次欠款"
+            :disabled="disabled"
           ></el-input
         ></span>
       </div>
-      <!-- <Computed></Computed> -->
     </div>
     <popup ref="Popup" :content="content" :content_1="content_1" :content_2="content_2" :number="number" :orderList ="orderList" :type="type"></popup>
   </div>
@@ -484,6 +490,7 @@ export default {
       page: 1,
       limit: 10,
       goodType: [],
+       Reviewed: false,
       goodInfo: [],
       org_id: 0,
       types: [],
@@ -532,8 +539,17 @@ export default {
       orderInfo: [],
       warese_out_id: 0,
       return_remark: "",
+      tableDataList:[],
     };
   },
+
+  watch(){
+      // total_price:function(newval,oldval){
+      //   console.log(newval,'op')
+      // }
+
+  },
+
   methods: {
     getInitOrder() {
       getInitOrder().then((response) => {
@@ -623,7 +639,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;
@@ -712,7 +728,7 @@ export default {
       tempObj["good_number"] = "";
       this.recordInfo.tableList.push(tempObj);
     },
-    handleDelete: function (index, row) { 
+    handleDelete: function (index, row) {
       if(this.is_check == 1){
         this.$message.error("已审核单据，不能删除!")
         return false
@@ -805,6 +821,7 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
+      this.addressChange()
       return total_price.toFixed(2);
     },
        addressChange() {
@@ -835,8 +852,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;
@@ -858,6 +874,8 @@ export default {
             this.showOne = false;
             this.showTwo = true;
             this.showThree = true;
+            this.disabled = true
+            this.Reviewed = true;
           }
 
           this.id = out.id;
@@ -921,6 +939,9 @@ export default {
 
           this.recordInfo.tableList = [];
           this.recordInfo.tableList = orderInfo;
+          this.tableDataList = []
+          this.tableDataList = orderInfo
+
         }
       });
     },
@@ -960,8 +981,18 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           }
+          //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
+
+          if(this.tableDataList.length != this.recordInfo.tableList){
+             warehousing_id = 0
+             for(let i=0;i<this.recordInfo.tableList.length;i++){
+              this.recordInfo.tableList[i].id = 0
+              this.recordInfo.tableDataList[i].order_number = ""
+              this.number = ""
+             }
+          }
           console.log("param23322332323",params)
-        
+          return
           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;
@@ -1004,8 +1035,7 @@ export default {
             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;
+                  goodOrder[i].count = goodOrder[i].count * drugList[j].min_number;
                 }
               }
             }
@@ -1051,20 +1081,20 @@ export default {
                   if (purcaseOrder[i].project_id == newArr[j].project_id) {
                     //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据,部分入库
                     if (purcaseOrder[i].count > newArr[j].count) {
-                      arr.push(purcaseOrder[i].project_id);
+                       arr.push(purcaseOrder[i].project_id);
                     }
                   }
                 }
               }
               //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
-
+              console.log("审核23232323323",arr)
               if (arr.length == 0) {
-                is_warehouse = 1;
+                 is_warehouse = 1;
                 this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
               }
 
               //部分入库
-              if (total != goodOrder.length) {
+              if (arr.length >0) {
                 //修改订购单
                 is_warehouse = 3;
                 this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
@@ -1133,7 +1163,7 @@ export default {
             }
 
             console.log("数据变了后23323233",outList)
-           
+
             let objInfo = {};
             if(cancelOrderList.length >0){
               cancelOrderList.forEach((item, index) => {
@@ -1155,15 +1185,15 @@ export default {
                     newArr[j].child.push(cancelOrderList[i])
                 }
               }
-              
-             } 
+
+             }
 
             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 = "";
@@ -1183,7 +1213,7 @@ export default {
 
               if (arr.length == 0) {
                 this.$message.error("该订单已全部生成退库单，请知悉!");
-                return 
+                return
               }
               console.log("arr23323232232323",arr)
               if (arr.length > 0) {
@@ -1191,12 +1221,12 @@ export default {
                 this.$router.push({ path: "/good/return/edit?id=" + id + "&ids=" + str});
               }
              }
-         
+
           }
          }
         }
       });
-     
+
     },
     //反审核
     MofyGoodOrder() {
@@ -1211,7 +1241,7 @@ export default {
           var msg = response.data.data.msg;
           if (msg == 1) {
             this.$message.success("反审核成功!");
-            return 
+            return
           }
           if (msg == 2) {
             var cancelList = response.data.data.cancelList
@@ -1412,4 +1442,10 @@ export default {
   bottom: 20px;
   height: 100%;
 }
+.reviewImg {
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 30%;
+}
 </style>

src/xt_pages/supply/components/editGoodReturn.vue

@@ -62,12 +62,6 @@
           <el-button size="small" type="primary" @click="updateGoodReturn">保存</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>
 
@@ -548,7 +542,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;
@@ -897,77 +891,39 @@ export default {
       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
-    //             }
-
-    //   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();
+    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
+                }
+             }
+          }
+          var params = {
+            stockIn:this.recordInfo.tableList,
+            return_marke:this.return_remark,
+          }
+          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;
-    //           }
-    //         }
-    //       }
-    //       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 = {
@@ -978,7 +934,7 @@ export default {
        if(response.data.state == 1){
         this.loading = false
         var msg = response.data.data.msg
-        this.$message.success("保存成功!")
+        this.$message.success("审核成功!")
        }
      })
     },
@@ -990,17 +946,12 @@ export default {
      }
      modefyReturnOrder(params).then(response=>{
        if(response.data.state == 1){
-
+         this.loading = false
+         var msg = response.data.data.msg
+         this.$message.success("反审核成功!")
        }
      })
     },
-    checkReturnOrder() {
-      var params = {
-        warehouse_out_id: this.warehouse_out_id,
-        id: this.id,
-      };
-      checkReturnOrder(params).then((response) => {});
-    },
   },
   created() {
     const tempObj = {};

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -141,6 +141,7 @@
                 style="width: 120px"
                 :disabled="true"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="规格&单位" align="center" width="200px">
@@ -150,6 +151,7 @@
                 style="width: 150px"
                 :disabled="true"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="单位" align="center" width="120px">
@@ -187,6 +189,7 @@
                 style="width: 100px"
                 :disabled="true"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="数量" align="center" width="180px">
@@ -216,12 +219,14 @@
                 :disabled="disabled"
                 placeholder="请输入采购单价"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </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) }}
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -241,6 +246,7 @@
                 >
                 </el-option>
               </el-select>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -251,6 +257,7 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -262,6 +269,7 @@
                 :disabled="disabled"
                 placeholder="请输入备注"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -374,7 +382,8 @@ import {
   getAllOrderCountList,
   getGoodOrderList,
   getReturnOrder,
-  deletePurchaseOrder
+  deletePurchaseOrder,
+  deletePurchOder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -557,7 +566,7 @@ export default {
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
-            goodList[i].supply_license_number = "";
+            goodList[i].supply_license_number = goodList[i].number
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;
@@ -569,7 +578,7 @@ export default {
             this.tabList.push(goodList[i]);
           }
           this.goodList = goodList;
-          console.log(this.goodList, "oo");
+          
         }
       });
     },
@@ -631,6 +640,7 @@ export default {
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
+      
       if(this.is_check == 1){
          this.$message.error("已审核单据，不能删除!")
          return false
@@ -651,7 +661,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            deletePurchaseOrder(params).then(response => {
+            deletePurchOder(params).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -730,8 +740,7 @@ export default {
       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();
@@ -761,7 +770,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-          console.log("param23232332", params);
+         
 
           updatePurchaseOrder(
             params,
@@ -791,6 +800,7 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
+      this.addressChange()
       return total_price.toFixed(2);
     },
 
@@ -845,7 +855,7 @@ export default {
             this.showTwo = false;
             this.showThree = true;
           }
-          console.log("drugli323322332", this.drugList);
+         
           var drugList = response.data.data.baseList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
@@ -882,7 +892,7 @@ export default {
               }
             }
           }
-          console.log("orderINFO23323232", orderInfo);
+         
           this.recordInfo.tableList = [];
           this.recordInfo.tableList = orderInfo;
         }
@@ -902,12 +912,11 @@ export default {
       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 drugList = response.data.data.drugList;
-          console.log("druglist23323223", drugList);
+      
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
@@ -954,7 +963,7 @@ export default {
                 }
               }
             }
-            console.log("newAr2332232323", newArr);
+     
 
             for (let i = 0; i < newArr.length; i++) {
               for (let j = 0; j < newArr[i].child.length; j++) {
@@ -1008,7 +1017,7 @@ export default {
       getGoodOrderList(id).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list
-          console.log("list23232323",list)
+        
           this.orderList = list
           //如果长度大于0,有购货单不能反审核
           if (list.length > 0) {
@@ -1030,6 +1039,7 @@ export default {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
           this.disabled = false;
+          this.Reviewed = false
           this.$message.success("反审核成功!");
           this.getPurchaseOrderDetail();
         }

src/xt_pages/supply/components/editSupply.vue

@@ -918,7 +918,7 @@ background-color: #d0d3da;
 }
 .el-table__fixed-right{
   width:150px;
-  bottom: 20px;
+  /* bottom: 20px; */
   height: 100%;
 }
 </style>

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -3,49 +3,61 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container ">
-      <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+    <div class="app-container">
+      <div
+        style="
+          justify-content: space-between;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
         <div>
-        
           <el-date-picker
             size="small"
             v-model="start_time"
             prefix-icon="el-icon-date"
             :editable="false"
-            style="width: 196px;"
+            style="width: 196px"
             type="date"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="startTimeChange"
-           ></el-date-picker>-
-            <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
+          >-
+          <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>审核状态:</span>
-           <el-select v-model="check_id" style="width:140px;margin-right:10px;" placeholder="请选择"
-            @change="changeTypeName">
+          <el-select
+            v-model="check_id"
+            style="width: 140px; margin-right: 10px"
+            placeholder="请选择"
+            @change="changeTypeName"
+          >
             <el-option
-                v-for="item in checkList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id">
+              v-for="item in checkList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
           <el-input
             size="small"
-            style="width: 200px;margin-left:10px;"
+            style="width: 200px; margin-left: 10px"
             class="filter-item"
             v-model.trim="keywords"
             placeholder="订单编号或供应商名称"
@@ -64,12 +76,11 @@
         </div>
       </div>
 
-
-       <el-table
+      <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
+          color: '#606266',
         }"
         :data="tableList"
         :class="signAndWeighBoxPatients"
@@ -77,98 +88,99 @@
       >
         <el-table-column label="订单日期" align="center">
           <template slot-scope="scope">
-            <span>{{getTimes(scope.row.document_date)}}</span>
-         </template>
+            <span>{{ getTimes(scope.row.document_date) }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="订单编号" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.number}}</span>
+            <span>{{ scope.row.number }}</span>
           </template>
         </el-table-column>
         <el-table-column label="供应商" align="center">
-            <template slot-scope="scope">
-              <span>{{getName(scope.row.supplier_id)}}</span>
-            </template>
-         </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">
+            <span>{{ getName(scope.row.supplier_id) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联采购单号" align="center" width="150">
+          <template slot-scope="scope">
+            <div style="width: 100%; height: 100%">
+              <tr class="color" 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">
           <template slot-scope="scope">
-             <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span> 
+            <span v-if="getAllBuyPrice(scope.row.orderInfo) > 0">{{
+              getAllBuyPrice(scope.row.orderInfo)
+            }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="数量" align="center">
+          <template slot-scope="scope">
+            {{ getAllCount(scope.row.orderInfo) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="订单状态" align="center">
+          <template slot-scope="scope">
+            <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">
-           {{getAllCount(scope.row.orderInfo)}}
-         </template>
-       </el-table-column>
-       <el-table-column label="订单状态" align="center">
-         <template slot-scope="scope">
-           <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)}}
-         </template>
-       </el-table-column>
-        
-    
-      <el-table-column label="制单人" align="center">
-         <template slot-scope="scope">
-          {{getDocName(scope.row.creater)}}
-         </template>
-       </el-table-column>
+          <template slot-scope="scope">
+            {{ getTimes(scope.row.delivery_date) }}
+          </template>
+        </el-table-column>
 
-      <el-table-column label="审核人" align="center">
-         <template slot-scope="scope">
-          {{getDocName(scope.row.checker)}}
-         </template>
-       </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{ getDocName(scope.row.creater) }}
+          </template>
+        </el-table-column>
 
-       <el-table-column label="操作" align="center" width="200px">
+        <el-table-column label="审核人" align="center">
           <template slot-scope="scope">
-              <el-button
-                icon="el-icon-edit-outline"
-                size="small"
-                type="primary"
-                @click="toClick(scope.row.id)"
+            {{ getDocName(scope.row.checker) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center" width="200px">
+          <template slot-scope="scope">
+            <el-button
+              icon="el-icon-edit-outline"
+              size="small"
+              type="primary"
+              @click="toClick(scope.row.id)"
               >编辑
-              </el-button>
-              <el-button
-                icon="el-icon-delete"
-                size="small"
-                type="danger"
-                @click="toDelete(scope.row,scope.$index)"
+            </el-button>
+            <el-button
+              icon="el-icon-delete"
+              size="small"
+              type="danger"
+              @click="toDelete(scope.row, scope.$index)"
               >删除
-              </el-button>
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,200,500,1000]"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
         :page-size="10"
         background
         align="right"
-        style="margin-top:20px;"
+        style="margin-top: 20px"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
-
     </div>
   </div>
 </template>
@@ -176,217 +188,229 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllPurchaseOrderList,deletePurchaseOrder} from "@/api/supply"
-import {uParseTime } from '@/utils/tools'
+import {
+  getAllSupply,
+  getAllPurchaseOrderList,
+  deletePurchaseOrder,
+} from "@/api/supply";
+import { uParseTime } from "@/utils/tools";
 export default {
   name: "stockIn",
-   components: {
-     
-   },
+  components: {},
   components: {
-    BreadCrumb
+    BreadCrumb,
   },
   data() {
     return {
+      isActive: false,
+      aa: ["111111", "22222"],
+      Color_txt: true,
       crumbs: [
         { path: false, name: "采购管理" },
-        { path: "/supply/query", name: "采购订单" }
+        { path: "/supply/query", name: "采购订单" },
       ],
       keywords: "",
       total: 0,
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       start_time: "",
-      end_time:"",
+      end_time: "",
       page: 1,
       limit: 10,
       goodType: [],
       goodInfo: [],
-      org_id:0,
-      types:[],
-      tableList:[{}],
-      type_name:"",
-      checkList:[
-        {id:0,name:"请选择"},
-        {id:1,name:"已审核"},
-        {id:2,name:"未审核"},
+      org_id: 0,
+      types: [],
+      tableList: [{}],
+      type_name: "",
+      checkList: [
+        { id: 0, name: "请选择" },
+        { id: 1, name: "已审核" },
+        { id: 2, name: "未审核" },
       ],
-      supplyList:[],
-      check_id:0,
-      doctorList:[],
+      supplyList: [],
+      check_id: 0,
+      doctorList: [],
     };
   },
-  methods:{
-     toAdd(){
-       this.$router.push({path:"/purchase/order/add"})
-     },
-     changeTypeName(){
-       this.getlist()
-     },
-     startTimeChange(){
-      this.getlist()
-     },
-     endTimeChange(){
-      this.getlist()
-     },
-     search(){
-      this.getlist()
-     },
-     handleSizeChange(val){
-       this.limit = val
-       this.getlist()
-     },
-     handleCurrentChange(val){
-       this.page = val
-       this.getlist()
-     },
-     getAllSupply(){
-       getAllSupply().then(response=>{
-         if(response.data.state == 1){
-            var supplyList = response.data.data.supplyList
-            this.doctorList = response.data.data.doctorList
-            for(let i=0;i<supplyList.length;i++){
-              this.supplyList.push(supplyList[i])
-            }
-         }
-       })
-     },
-     getTimes(time) {
-      if (time === '') {
-      return ''
+  methods: {
+    toAdd() {
+      this.$router.push({ path: "/purchase/order/add" });
+    },
+    changeTypeName() {
+      this.getlist();
+    },
+    startTimeChange() {
+      this.getlist();
+    },
+    endTimeChange() {
+      this.getlist();
+    },
+    search() {
+      this.getlist();
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist();
+    },
+    getAllSupply() {
+      getAllSupply().then((response) => {
+        if (response.data.state == 1) {
+          var supplyList = response.data.data.supplyList;
+          this.doctorList = response.data.data.doctorList;
+          for (let i = 0; i < supplyList.length; i++) {
+            this.supplyList.push(supplyList[i]);
+          }
+        }
+      });
+    },
+    getTimes(time) {
+      if (time === "") {
+        return "";
       }
-      return uParseTime(time, '{y}-{m}-{d}')
-     },
-     getlist(){
-        console.log("hhhhhh",this.end_time)
-        var params = {
-          check_id:this.check_id,
-          start_time:this.start_time,
-          end_time:this.end_time,
-          keyword:this.keywords,
-          page:this.page,
-          limit:this.limit,
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getlist() {
+      console.log("hhhhhh", this.end_time);
+      var params = {
+        check_id: this.check_id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        keyword: this.keywords,
+        page: this.page,
+        limit: this.limit,
+      };
+      console.log("params2332232332", params);
+      getAllPurchaseOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          this.tableList = list;
+          var total = response.data.data.total;
+          this.total = total;
         }
-       console.log("params2332232332",params)
-       getAllPurchaseOrderList(params).then(response=>{
-          if(response.data.state == 1){
-            var list = response.data.data.list 
-            this.tableList = list
-            var total = response.data.data.total
-            this.total = total
-          }
-       })
-     },
-     getName(id){
-       var name = ""
-       for(let i=0;i<this.supplyList.length;i++){
-         if(id == this.supplyList[i].id){
-           name = this.supplyList[i].supplier_name
-         }
-       }
-       return name
-     },
-     getDocName(id){
-      var user_name = ""
-      for(let i=0;i<this.doctorList.length;i++){
-        if(id == this.doctorList[i].admin_user_id){
-          user_name = this.doctorList[i].user_name
+      });
+    },
+    getName(id) {
+      var name = "";
+      for (let i = 0; i < this.supplyList.length; i++) {
+        if (id == this.supplyList[i].id) {
+          name = this.supplyList[i].supplier_name;
         }
       }
-      return user_name
-     },
-     getAllBuyPrice(arr){
-       var buy_price = 0
-       if(arr!=undefined && arr.length > 0){
-          for(let i=0;i<arr.length;i++){
-            buy_price += (arr[i].count * arr[i].price)
-          }
-       }
-       return buy_price.toFixed(2)
-     },
-     getAllCount(arr){
-       var count = 0
-        if(arr!=undefined && arr.length > 0){
-          for(let i=0;i<arr.length;i++){
-            count += parseInt(arr[i].count)
-          }
-       }
-       if(count == 0){
-         return ""
-       }
-       if(count > 0){
-         return count
-       }
-      
-     },
-     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 => {
+      return name;
+    },
+    getDocName(id) {
+      var user_name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          user_name = this.doctorList[i].user_name;
+        }
+      }
+      return user_name;
+    },
+    getAllBuyPrice(arr) {
+      var buy_price = 0;
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          buy_price += arr[i].count * arr[i].price;
+        }
+      }
+      return buy_price.toFixed(2);
+    },
+    getAllCount(arr) {
+      var count = 0;
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          count += parseInt(arr[i].count);
+        }
+      }
+      if (count == 0) {
+        return "";
+      }
+      if (count > 0) {
+        return count;
+      }
+    },
+    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("删除成功")
+              var msg = response.data.data.msg;
+              this.tableList.splice(index, 1);
+              this.$message.success("删除成功");
             } else {
-                this.$message.error("删除失败")
+              this.$message.error("删除失败");
             }
-          })
+          });
         })
-        .catch(() => {
-        }) 
-      }
+        .catch(() => {});
+    },
+    // 动态改变表格样式
+    Color_Change() {
+      this.Color_txt = true;
+      console.log(this.Color_txt, "op");
+    },
+
+    Color_Changeleave() {
+      this.Color_txt = false;
+      console.log(this.Color_txt, "false");
+    },
   },
   created() {
-    var now = new Date(); //当前日期 
-    var nowMonth = now.getMonth(); //当前月 
-    var nowYear = now.getFullYear(); //当前年 
+    var now = new Date(); //当前日期
+    var nowMonth = now.getMonth(); //当前月
+    var nowYear = now.getFullYear(); //当前年
     //本月的开始时间
-    var monthStartDate = new Date(nowYear, nowMonth, 1); 
-    this.start_time = this.getTimes(monthStartDate) 
-    this.end_time = this.getTimes(new Date())
-    this.org_id =  this.$store.getters.xt_user.org_id
-    this.getAllSupply()
-    this.getlist()
+    var monthStartDate = new Date(nowYear, nowMonth, 1);
+    this.start_time = this.getTimes(monthStartDate);
+    this.end_time = this.getTimes(new Date());
+    this.org_id = this.$store.getters.xt_user.org_id;
+    this.getAllSupply();
+    this.getlist();
   },
- 
 };
 </script>
 <style lang="scss">
-  .cluster-rs {
+.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;
   }
-  .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;
-    }
+}
+tr:last-child {
+  td {
+    border-bottom: none;
   }
+}
 </style>
 
 <style rel="stylesheet/css" lang="scss" scoped>
@@ -440,4 +464,9 @@ export default {
   background-color: #d0d3da;
 }
 
+.color {
+  background: none !important;
+  display: flex;
+  flex-direction: column;
+}
 </style>

src/xt_pages/supply/supplyQuery.vue

@@ -16,6 +16,7 @@
           <el-select
             v-model="type_name"
             style="width: 170px; margin-right: 10px"
+            clearable
             placeholder="请选择供应商类别"
             @change="changeTypeName"
           >
@@ -230,6 +231,11 @@ export default {
     },
 
     toDelete(val, index) {
+      this.$confirm('确认删除吗？','删除',{
+        confirmButtonText: '确 定',
+        concelmButtonText: '取 消',
+        type: 'warning'
+      }).then(() => {
       delsupplys(val.ID)
         .then((res) => {
           if (res.data.code == 0) {
@@ -242,6 +248,7 @@ export default {
         .catch((err) => {
           console.log(err);
         });
+      }).catch(() => {})
     },
 
     toAdd(val) {