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

src/views/layout/Layout.vue

@@ -17,15 +17,11 @@
           <p>透析管理</p>
         </div>
 
-
-
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
-        </div> -->
-
-
-
+        </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/data/printTemplate/prescriptionPrint.vue

@@ -10,26 +10,42 @@
     </p>
     <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
-        <div
-            @click="imgClick('https://images.shengws.com/2020/12/3/admin_avatar_1606984919688.png')"
-        >
-            <el-tooltip
-            class="item"
-            effect="dark"
-            :hide-after="2000"
-            content="点击查看大图"
-            placement="top-start"
-            >
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/88.png')"
-            ></el-image>
+        <div v-if="org_id == 10243">
+          <div @click="imgClick('https://kuyi.shengws.com/dali.jpeg')">
+              <el-tooltip
+              class="item"
+              effect="dark"
+              :hide-after="2000"
+              content="点击查看大图"
+              placement="top-start"
+              >
+              <el-image
+                  style="width: 200px; height: 200px"
+                  :src="require('@/assets/home/88.png')"
+              ></el-image>
 
-            </el-tooltip>
+              </el-tooltip>
+          </div>
         </div>
-        <el-radio v-model="radio" label="1" @change="change"
-            >模版一</el-radio
-        >
+        <div v-else>
+          <div @click="imgClick('https://images.shengws.com/2020/12/3/admin_avatar_1606984919688.png')">
+              <el-tooltip
+              class="item"
+              effect="dark"
+              :hide-after="2000"
+              content="点击查看大图"
+              placement="top-start"
+              >
+              <el-image
+                  style="width: 200px; height: 200px"
+                  :src="require('@/assets/home/88.png')"
+              ></el-image>
+
+              </el-tooltip>
+          </div>
+        </div>
+       
+        <el-radio v-model="radio" label="1" @change="change">模版一</el-radio>
         </el-col>
     </el-row>
  
@@ -80,7 +96,8 @@ export default {
       delay: 500,
       radio: 0,
       tempRadio: 0,
-      loading: false
+      loading: false,
+      org_id:0,
     };
   },
   methods: {
@@ -138,6 +155,8 @@ export default {
     }
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
+    console.log("orgid23322332232323",this.org_id)
     this.getlist()
   }
 };

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -734,7 +734,7 @@
                               : "/"
                           }}
                         </div>
-                        ml
+                        L
                       </div>
                       <div class="inline_block" style="flex:1;">
                         干体重：

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -107,11 +107,18 @@
       </ul>
 
       <ul>
-        <li v-if="isShow('目标超滤量')">
+        <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id != 10290">
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555 && this.$store.getters.xt_user.template_info.org_id != 9671"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 9671" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+        </li>
+
+         <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">
+          <label>目标超滤量 : </label>
+          <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
+          <span class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
         </li>
         <!-- <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -65,6 +65,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>
       <template v-if="org_template_info.template_id == 5">
         <div>
           <el-button

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -59,12 +59,12 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121">{{
+              <span>{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
-                  : ""
+                  : "/"
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              
             </div>
           </div>
           <div class="inline_block">
@@ -91,7 +91,6 @@
             </div>
           </div>
         </div>
-  
 
         <div
           class="row"
@@ -695,11 +694,8 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                    >
-                      <span>透析(滤)器/灌流器：</span>
+                    <div class="inline_block" style="flex: 1">
+                      <span>透析器/灌流器：</span>
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
@@ -707,16 +703,6 @@
                         {{
                           prescription.dialyzer_perfusion_apparatus
                             ? prescription.dialyzer_perfusion_apparatus
-                            : ""
-                        }}
-                        {{
-                          prescription.dialysis_dialyszers
-                            ? prescription.dialysis_dialyszers
-                            : ""
-                        }}
-                        {{
-                          prescription.dialysis_irrigation
-                            ? prescription.dialysis_irrigation
                             : "/"
                         }}
                       </div>
@@ -1586,7 +1572,6 @@
               </div>
             </div>
           </div>
-
         </template>
         <div class="row" style="margin-top: -11px; position: relative">
           <table class="proj_table">
@@ -1704,7 +1689,263 @@
                   </td>
                 </tr>
               </template>
-
+              <tr>
+                <td colspan="7">
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div class="inline_block" style="flex: 1">
+                      穿刺护士：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex: 1">
+                      治疗护士：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex: 1">
+                      核对人员：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                        v-if="dialysisOrder == null"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(check == null ? 0 : check.creater) ==
+                            ''
+                          "
+                        >
+                          {{ getAdminUser(check == null ? 0 : check.creater) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.creater)
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                        v-if="
+                          dialysisOrder != null &&
+                          dialysisOrder.start_nurse == check.modifier
+                        "
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(check == null ? 0 : check.creater) ==
+                            ''
+                          "
+                        >
+                          {{ getAdminUser(check == null ? 0 : check.creater) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.creater)
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                        v-if="
+                          dialysisOrder != null &&
+                          dialysisOrder.start_nurse == check.creater
+                        "
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              check == null ? 0 : check.modifier
+                            ) == ''
+                          "
+                        >
+                          {{ getAdminUser(check == null ? 0 : check.modifier) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.modifier)
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                        v-if="
+                          dialysisOrder != null &&
+                          dialysisOrder.start_nurse != check.creater &&
+                          dialysisOrder.start_nurse != check.modifier
+                        "
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(check == null ? 0 : check.creater) ==
+                            ''
+                          "
+                        >
+                          {{ getAdminUser(check == null ? 0 : check.creater) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.creater)
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex: 1">
+                      下机护士：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.finish_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.finish_nurse
+                            )
+                          }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.finish_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex: 1">
+                      治疗医生：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="setAdminUserES(prescription.creater) == ''"
+                        >
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                  </div>
+                </td>
+              </tr>
             </tbody>
           </table>
           <!-- <div  class="print-yema">1</div> -->
@@ -1726,7 +1967,7 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
 
 export default {
-  name: 'DialysisPrintOrderFortySix',
+  name: "DialysisPrintOrderFortySix",
   props: ["childResponse"],
   components: {
     // DialysisPrintOrderOne,

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -65,6 +65,8 @@
                   showValue='临时股静脉导管'></label-box>
               &nbsp;
               <label-box :isChecked="prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name.indexOf('长期插管')>-1?true:false : false"
+                  showValue='长期插管'></label-box>
+              <label-box :isChecked="prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name.indexOf('长期静脉导管')>-1?true:false : false"
                   showValue='长期静脉导管'></label-box>
               &nbsp;
             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -407,7 +407,7 @@
                       <div class="under_line" style="width: 100px;text-align: center">
                         {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
                       </div>
-                      L
+                     L
                     </div>
                     <div class="inline_block" style="flex:1;">
                       干体重：

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -618,7 +618,7 @@ export default {
     handleEdit:function(index,row){
        this.$router.push({
          name:"drugStockInOrderEdit",
-         query:{id:row.id,type:this.type}
+         query:{id:row.id,type:this.type,supply_warehouse_id:row.supply_warehouse_id}
        })
     },
     handleSearch(id){
@@ -649,6 +649,11 @@ export default {
       });
     },
     handleDelete: function(index, row) {
+      console.log("rowe23323223",row)
+      if(row.supply_warehouse_id >0 ){
+        this.$message.error("自动入库数据不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -709,8 +714,17 @@ export default {
         return;
       }
       const ids = [];
+      const idOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
         ids.push(this.selectedTableData[i].id);
+        idOne.push(this.selectedTableData[i].supply_warehouse_id)
+      }
+      console.log("idson233223233223",idOne)
+      for(let i=0;i<idOne.length;i++){
+        if(idOne[i] >0 ){
+           this.$message.error("自动入库数据不能删除!")
+           return false
+        }
       }
       const idStr = ids.join(",");
       const params = {

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -48,6 +48,7 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
+          :disabled="disabled"
         >
         </el-date-picker>
       </div>
@@ -83,7 +84,8 @@
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
-                    :disabled="drug_show"
+                    :disabled="disabled"
+                   
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -99,12 +101,14 @@
               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商" :disabled="disabled">
                 <el-option
                   v-for="(option, index) in drugTypeList"
                   :key="index"
                   :label="option.name"
-                  :value="option.id">
+                  :value="option.id"
+                  
+                  >
                 </el-option>
                </el-select>
             </template>
@@ -130,6 +134,7 @@
               <template slot-scope="scope">
                 <el-form-item style="padding-top: 20px" :rules="tableRules.batch_number"  :prop="'recordData.' + scope.$index + '.batch_number'">
                   <el-input
+                   :disabled="disabled"
                     placeholder="请输入批号"
                     v-model="scope.row.batch_number"
                   ></el-input>
@@ -150,6 +155,7 @@
               >
                 <div style="display:flex;">
                   <el-input
+                   :disabled="disabled"
                     oninput="value=value.replace(/\D|^0/g,'')"
                     placeholder="请输入入库数量"
                     type="number"
@@ -157,12 +163,13 @@
                     style="width:80px"
                   ></el-input>
                    <!-- {{scope.row.max_unit}} -->
-                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px"  :disabled="disabled">
                     <el-option
                       v-for="(option, index) in unitList"
                       :key="index"
                       :label="option.name"
-                      :value="option.name">
+                      :value="option.name"
+                     >
                     </el-option>
                   </el-select>
                 </div>
@@ -226,6 +233,7 @@
                 :rules="tableRules.expiry_date"
                 style="padding-top: 20px">
                 <el-date-picker
+                 :disabled="disabled"
                   prefix-icon="el-icon-date"
                   style="width: 145px"
                   v-model="scope.row.expiry_date"
@@ -241,6 +249,7 @@
           <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
+              :disabled="disabled"
                 prefix-icon="el-icon-date"
                 style="width: 145px"
                 v-model="scope.row.product_date"
@@ -255,12 +264,13 @@
              
           <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商"  :disabled="disabled">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
                   :label="option.manufacturer_name"
-                  :value="option.id">
+                  :value="option.id"
+                 >
                 </el-option>
                </el-select>
             </template>
@@ -274,7 +284,8 @@
                   v-for="(option, index) in dealerList"
                   :key="index"
                   :label="option.dealer_name"
-                  :value="option.id">
+                  :value="option.id"
+                  :disabled="disabled">
                 </el-option>
                 </el-select>
             </template>
@@ -285,6 +296,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
+                 :disabled="disabled"
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
                 ></el-input>
@@ -294,7 +306,7 @@
  
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark" :disabled="disabled"></el-input>
             </template>
           </el-table-column>
 
@@ -439,6 +451,7 @@ export default {
       unitList:[],
       drug_show:false,
       loading:false,
+      disabled:false,
     };
   },
   methods: {
@@ -538,6 +551,11 @@ export default {
       return name;
     },
     handleEdit: function(index, row) {
+      console.log("row23323223",row)
+      if(row.supply_warehouse_id > 0){
+        this.$message.error("自动入库数据不能新增!")
+        return false
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["drug_id"] = 0;
@@ -555,6 +573,10 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
+      if(row.supply_warehouse_id > 0){
+        this.$message.error("自动入库数据不能删除!")
+        return false
+      }
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {
@@ -883,11 +905,13 @@ export default {
   created() {
    
     this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-    //this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
     this.GetOrderDetail(order_id);
     this.unitList =  getDataConfig('hemodialysis','units')
+    if( parseInt(this.$route.query.supply_warehouse_id)>0){
+      this.disabled = true
+    }
   }
 };
 </script>

src/xt_pages/stock/stockInOrder.vue

@@ -1059,13 +1059,15 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      // this.$router.push({
-      //   name: "stockInDetail",
-      //   query: { id: row.id, type: this.type }
-      // });
-      this.$router.push({path:"/stock/in/order/edit?id="+row.id})
+      console.log("rowe232323232332",row)
+      this.$router.push({path:"/stock/in/order/edit?id="+row.id+"&supply_warehouse_id="+row.supply_warehouse_id})
     },
     handleDelete: function(index, row) {
+     
+      if(row.supply_warehouse_id > 0){
+        this.$message.error("自动生成入库单不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -1122,9 +1124,19 @@ export default {
         return;
       }
       const ids = [];
+      const idOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
         ids.push(this.selectedTableData[i].id);
+        idOne.push(this.selectedTableData[i].supply_warehouse_id)
+      }
+      console.log("idson23322323",idOne)
+      for(let i=0;i<idOne.length;i++){
+        if(idOne[i] >0){
+          this.$message.error("自动入库数据不能删除!")
+          return false
+        }
       }
+    
       const idStr = ids.join(",");
       const params = {
         ids: idStr
@@ -1371,6 +1383,7 @@ export default {
       },
 
      DeleteWarehouseInfoItem: function(index, row) {
+       
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {

src/xt_pages/stock/stockInOrderEdit.vue

@@ -46,6 +46,7 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
+          :disabled="disabled"
         >
         </el-date-picker>
       </div>
@@ -74,6 +75,7 @@
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
                     style="width:150px;"
+                    :disabled ="disabled"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -93,6 +95,7 @@
                   placeholder="请输入耗材类型"
                   v-model="scope.row.good_type_id"
                   :value="typeName(scope.row.good_type_id)"
+                   :disabled ="disabled"
                 ></el-input>
               </el-form-item>
             </template>
@@ -105,7 +108,7 @@
             <template slot-scope="scope">
 
               <el-form-item style="padding-top: 20px">
-                <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
+                <el-input placeholder="请输入规格名称" v-model="scope.row.name"  :disabled ="disabled"></el-input>
               </el-form-item>
 
             </template>
@@ -118,7 +121,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px" :prop="'recordData.' + scope.$index + '.number'"
                             :rules='tableRules.number' >
-                <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
+                <el-input placeholder="请输入批号" v-model="scope.row.number"  :disabled ="disabled"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -172,6 +175,7 @@
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
+                   :disabled ="disabled"
                 ></el-input>
                 {{scope.row.min_unit}}
               </el-form-item>
@@ -192,7 +196,7 @@
                 :rules="tableRules.expiry_date">
                 <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
                                 type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd">
+                                value-format="yyyy-MM-dd"  :disabled ="disabled">
                 </el-date-picker>
              </el-form-item>
             </template>
@@ -209,13 +213,14 @@
                 placeholder="选择日期时间"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :disabled ="disabled"
               ></el-date-picker>
             </template>
           </el-table-column>
 
            <el-table-column label="生产厂家" align="center" width="150">
              <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商"  :disabled ="disabled">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -237,7 +242,7 @@
                 <el-input
                   placeholder="请输入批准文号"
                   v-model="scope.row.license_number"
-                  
+                  :disabled ="disabled"
                 ></el-input>
               </el-form-item>
             </template>
@@ -249,14 +254,15 @@
                   v-for="(option, index) in dealerList"
                   :key="index"
                   :label="option.dealer_name"
-                  :value="option.id">
+                  :value="option.id"
+                   :disabled ="disabled">
                 </el-option>
                </el-select>
             </template>
           </el-table-column>
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark"  :disabled ="disabled"></el-input>
             </template>
           </el-table-column>
 
@@ -395,6 +401,7 @@ export default {
       manufacturerList:[],
       numberList:[],
       loading:false,
+      disabled:false,
     };
   },
   methods: {
@@ -486,6 +493,10 @@ export default {
       return name;
     },
     handleEdit: function(index, row) {
+      if(row.supply_warehouse_id > 0){
+        this.$message.error("自动入库数据不能新增!")
+        return false
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["good_type_id"] = 0;
@@ -503,6 +514,11 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
+      console.log("Row2332233232",row)
+      if(row.supply_warehouse_id >0){
+        this.$message.error("自动入库数据不能删除!")
+        return false
+      }
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {
@@ -819,7 +835,12 @@ export default {
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
+    var supply_warehouse_id =  parseInt(this.$route.query.supply_warehouse_id)  
+    if(supply_warehouse_id > 0){
+      this.disabled = true
+    }
     this.GetOrderDetail(order_id);
+
   }
 };
 </script>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -12,12 +12,13 @@
           align-items: center;
         "
       >
-        <div>
+        <div style="display:flex;align-items: center;">
           <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"
@@ -29,6 +30,7 @@
           </el-select>
           <span>单据日期:</span>
           <el-date-picker
+            :disabled="disabled"
             size="small"
             v-model="start_time"
             prefix-icon="el-icon-date"
@@ -56,7 +58,7 @@
         ></el-date-picker> -->
           <span>单据编码:{{ good_number }}</span>
         </div>
-        <div>
+        <div style="display:flex">
           <el-button
             size="small"
             type="primary"
@@ -71,7 +73,9 @@
             v-show="showTwo"
             >保存</el-button
           >
-          <el-button size="small" type="primary" @click="checkGoodOrder" >审核</el-button>
+          <el-button size="small" type="primary" @click="checkGoodOrder" v-if="is_check == 2" >审核</el-button>
+          <el-button size="small" type="primary" @click="MofyGoodOrder" v-if="is_check == 1">反审核</el-button>
+          <el-button size="small" type="primary" @click="toClick" v-if="is_check == 1" >生成采购退货单</el-button>
         </div>
       </div>
 
@@ -238,6 +242,18 @@
             </template>
           </el-table-column>
 
+           <el-table-column label="拆零零售价" align="center" width="180px">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.min_price"
+                style="width: 140px"
+                :disabled="disabled"
+                placeholder="请输入拆零零售价"
+              ></el-input>
+              <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="采购单价" align="center" width="180px">
             <template slot-scope="scope">
               <el-input
@@ -253,6 +269,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">
@@ -388,6 +405,7 @@
               v-model="rate_of_concession"
               @input="addressChange"
               placeholder="请输入优惠率"
+              :disabled="disabled"
             ></el-input
             >%</span
           >
@@ -398,6 +416,7 @@
               v-model="discount_amount"
               @input="count_discount"
               placeholder="请输入优惠金额"
+              :disabled="disabled"
             ></el-input
           ></span>
 
@@ -407,6 +426,7 @@
               v-model="payment"
               @input="count_payment"
               placeholder="请输入本次付款"
+              :disabled="disabled"
             ></el-input
           ></span>
 
@@ -449,7 +469,9 @@ import {
   updateGoodOrder,
   checkGoodOrderById,
   getGoodOrderCountList,
-  ModefySupplyWarehousing
+  ModefySupplyWarehousing,
+  MofyGoodOrder,
+  getSupplyWarehouseOutById
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -597,6 +619,7 @@ export default {
             drugList[i].supply_remake = "";
             drugList[i].type = 1;
             drugList[i].supply_price = drugList[i].last_price;
+            drugList[i].min_price = drugList[i].min_price
             drugList[i].name = drugList[i].drug_name;
             if (drugList[i].max_unit != drugList[i].min_unit) {
               drugList[i].unitList = [
@@ -652,6 +675,7 @@ export default {
             goodList[i].name = goodList[i].good_name;
             goodList[i].unitList = [{ id: 1, name: "" }];
             goodList[i].supply_unit = goodList[i].packing_unit;
+            goodList[i].min_price = goodList[i].retail_price
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
@@ -672,9 +696,9 @@ export default {
           this.recordInfo.tableList[i].name = val.name;
           this.recordInfo.tableList[i].supply_name = val.supply_name;
           this.recordInfo.tableList[i].supply_type = val.supply_type;
-          this.recordInfo.tableList[i].supply_specification_name =
-            val.supply_specification_name;
+          this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
+          this.recordInfo.tableList[i].min_price = val.min_price  
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
           } else {
@@ -723,6 +747,7 @@ export default {
       tempObj["order_number"] = "";
       tempObj["supply_expiry_date"] = "";
       tempObj["manufacturer_id"] = "";
+      tempObj["min_price"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -791,6 +816,7 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
+      this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
       return total_price.toFixed(2);
     },
     addressChange() {
@@ -802,6 +828,7 @@ export default {
         ).toFixed(2);
       }
       this.discount_amount = discount_amount;
+     
     },
     count_discount() {
       this.rate_of_concession = (
@@ -810,7 +837,12 @@ export default {
       ).toFixed(2);
     },
     count_payment() {
-      this.arrearage = this.total_price - this.payment;
+      let arrearage_1 = (this.total_price - this.discount_amount - this.payment).toFixed(2);
+       if(arrearage_1 > 0){
+          this.arrearage = arrearage_1
+       }else{
+         this.arrearage = 0
+       }
     },
 
     count_arrearage() {
@@ -839,7 +871,9 @@ export default {
       getPurchaseOrderInfo(id, ids).then((response) => {
         if (response.data.state == 1) {
           var info = response.data.data.info;
-          this.is_check = info.is_check;
+          
+         
+
           this.id = info.id;
           this.supplier_name = info.supplier_id;
           this.rate_of_concession = info.rate_of_concession;
@@ -862,6 +896,7 @@ export default {
             orderInfo[i].project_id = orderInfo[i].project_id;
             orderInfo[i].supply_unit = orderInfo[i].supply_unit;
             orderInfo[i].order_number = orderInfo[i].order_number;
+            orderInfo[i].min_price = ""
             orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2);
             if (orderInfo[i].is_source == 1) {
               for (let j = 0; j < drugList.length; j++) {
@@ -919,6 +954,7 @@ export default {
           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].min_price = this.recordInfo.tableList[i].min_price.toString()
 
         for (let j = 0; j < this.manufactuerList.length; j++) {
           if (
@@ -943,8 +979,9 @@ export default {
           this.loading = true;
           var warehousing_id = this.$route.query.id;
           //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
-        
-          if(this.tableDataList.length != this.recordInfo.tableList){
+          console.log("长度2332233232",this.tableDataList.length)
+          console.log("产股2333223232323",this.recordInfo.tableList.length)
+          if(this.tableDataList.length != this.recordInfo.tableList.length){
              warehousing_id = 0
              for(let i=0;i<this.recordInfo.tableList.length;i++){
               this.recordInfo.tableList[i].id = 0
@@ -963,7 +1000,9 @@ export default {
               this.showTwo = true;
               var orderInfo = response.data.data.list;
               var warehouseOut = response.data.data.warehouseOut;
+              this.is_check = 2
               this.warese_out_id = warehouseOut.id;
+              console.log("采购单id2322332",this.warese_out_id)
               this.good_number = warehouseOut.good_number;
               this.rate_of_concession = warehouseOut.rate_of_concession;
               this.discount_amount = warehouseOut.discount_amount;
@@ -993,23 +1032,13 @@ export default {
                 if (orderInfo[i].is_source == 1) {
                   for (let j = 0; j < this.drugList.length; j++) {
                     if (orderInfo[i].project_id == this.drugList[j].id) {
-                      if (
-                        this.drugList[j].max_unit != this.drugList[j].min_unit
-                      ) {
-                        orderInfo[i].unitList = [
-                          { id: 1, name: "" },
-                          { id: 2, name: "" },
-                        ];
-                        orderInfo[i].unitList[0].name =
-                          this.drugList[j].max_unit;
-                        orderInfo[i].unitList[1].name =
-                          this.drugList[j].min_unit;
+                      if (this.drugList[j].max_unit != this.drugList[j].min_unit) {
+                        orderInfo[i].unitList = [{ id: 1, name: "" },{ id: 2, name: "" }];
+                        orderInfo[i].unitList[0].name = this.drugList[j].max_unit;
+                        orderInfo[i].unitList[1].name = this.drugList[j].min_unit;
                       }
-                      if (
-                        this.drugList[j].max_unit == this.drugList[j].min_unit
-                      ) {
-                        orderInfo[i].unitList[0].name =
-                          this.drugList[j].max_unit;
+                      if (this.drugList[j].max_unit == this.drugList[j].min_unit) {
+                        orderInfo[i].unitList[0].name = this.drugList[j].max_unit;
                       }
                     }
                   }
@@ -1018,8 +1047,7 @@ export default {
                   for (let j = 0; j < this.goodList.length; j++) {
                     if (orderInfo[i].project_id == this.goodList[j].id) {
                       orderInfo[i].unitList = [{ id: 1, name: "" }];
-                      orderInfo[i].unitList[0].name =
-                        this.goodList[j].packing_unit;
+                      orderInfo[i].unitList[0].name = this.goodList[j].packing_unit;
                     }
                   }
                 }
@@ -1047,7 +1075,7 @@ export default {
           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].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 ==
@@ -1097,11 +1125,14 @@ export default {
     },
     checkGoodOrder() {
       var id = this.warese_out_id;
-      var warehousing_id = this.warehousing_id;
-      
+      var warehousing_id = this.id;
+      console.log("采购单ID",id)
+      console.log("采购订单ID",warehousing_id)
+    
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
+          this.disabled = true
           this.is_check = 1
           this.showOne = false;
           this.showTwo = true;
@@ -1207,6 +1238,240 @@ export default {
         }
       });
     },
+    MofyGoodOrder() {
+      var id = this.warese_out_id;
+      console.log("采购单ID",id)
+      var params = {
+        id: id,
+      };
+      MofyGoodOrder(params).then((response) => {
+        if (response.data.state == 1) {
+          var msg = response.data.data.msg;
+          if (msg == 1) {
+            this.$message.success("反审核成功!");
+            this.is_check = 2
+            this.disabled = false
+            this.Reviewed = false
+            return
+          }
+          if (msg == 2) {
+            var cancelList = response.data.data.cancelList
+            console.log("cancelLIST2332322332232323",cancelList)
+            this.orderList = cancelList
+            this.$refs.Popup.dialogVisible = true
+            return
+          }
+
+          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) {
+            this.$router.push({path: "/good/order/add?id=" + this.id + "&ids=" + ids});
+          }
+          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比较数量大小,如果采购单的数量大于采购订单的数据
+                    if (purcaseOrder[i].count < newArr[j].count) {
+                      arr.push(purcaseOrder[i].project_id);
+                    }
+                  }
+                }
+              }
+              //如果total的长度等于0,怎修改该订单的状态为全部入库
+
+              if (arr.length > 0) {
+                //修改采购订单的状态为全部入库
+                this.UpdateSupplyWahouseingInfo();
+              }
+            }
+          }
+        }
+      });
+    },
+    UpdateSupplyWahouseingInfo() {
+      var params = {
+        warehousing_id: this.$route.query.warehousing_id,
+      };
+      console.log("采购单ID",params)
+      UpdateSupplyWahouseingInfo(params).then((response) => {
+        if (response.data.state == 1) {
+          var msg = response.data.data.msg;
+        }
+      });
+    },
+    toClick() {
+      //先判断采购单号有没有关联的采购退货单号，如果没有，则为首次生成采购退货单
+      if (this.is_check == 2) {
+        this.$message.error("该采购单未审核,不能生成退货单数据!");
+        return false;
+      }
+      var id = this.warese_out_id;
+      console.log("生成采购单ID22323",id)
+      getSupplyWarehouseOutById(id).then((response) => {
+        if (response.data.state == 1) {
+          var cancelList = response.data.data.cancelList;
+          console.log("退库单", cancelList);
+           var drugList = response.data.data.drugList;
+          console.log("药品列表", drugList);
+          var cancelOrderList = response.data.data.cancelOrderList;
+          console.log("退库单详情", cancelOrderList);
+          var ids =""
+          if(cancelList.length == 0){
+            this.$router.push({ path: "/good/return/add?id=" +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++){
+                  if(outList[i].project_id == drugList[j].id){
+                    if(outList[i].supply_unit == drugList[j].max_unit){
+                      outList[i].count = outList[i].count * drugList[j].min_number
+                    }
+
+                  }
+                }
+              }
+            }
+
+            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].project_id == drugList[j].id){
+                    if(cancelOrderList[i].supply_unit == drugList[j].max_unit){
+                      cancelOrderList[i].count = cancelOrderList[i].count * drugList[j].min_number
+                    }
+                  }
+                 }
+               }
+            }
+
+          
+
+            let objInfo = {};
+            if(cancelOrderList.length >0){
+              cancelOrderList.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 < 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])
+                }
+              }
+
+             }
+
+            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 < outList.length; i++) {
+                for (let j = 0; j < newArr.length; j++) {
+                  if (outList[i].project_id == newArr[j].project_id) {
+                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示退货单的数量未满足采购单的数据，可以继续生成退货单
+                    if (outList[i].count > newArr[j].count) {
+                       arr.push(outList[i].project_id);
+                    }
+                  }
+                }
+              }
+              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
+
+              if (arr.length == 0) {
+                this.$message.error("该订单已全部生成退库单，请知悉!");
+                return
+              }
+              console.log("arr23323232232323",arr)
+              if (arr.length > 0) {
+                str = arr.join(",");
+                this.$router.push({ path: "/good/return/edit?id=" + id + "&ids=" + str});
+              }
+             }
+
+          }
+         }
+        }
+      });
+    },
   },
   created() {
     const tempObj = {};
@@ -1231,6 +1496,7 @@ export default {
     tempObj["order_number"] = "";
     tempObj["supply_expiry_date"] = "";
     tempObj["manufacturer_id"] = "";
+    tempObj["min_price"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     if (parseInt(this.$route.query.id) > 0) {
@@ -1243,6 +1509,10 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 .information {
   border: 1px #dcdfe6 solid;
   padding: 30px 20px 30px 20px;
@@ -1297,4 +1567,5 @@ export default {
   bottom: 20px;
   height: 100%;
 }
+
 </style>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -214,17 +214,20 @@
           <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="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="120px">
             <template slot-scope="scope">
               {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -683,6 +686,7 @@ export default {
         total_price += this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
+      this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
       return total_price.toFixed(2);
     },
 
@@ -702,8 +706,13 @@ export default {
         (this.total_price * 0.01)
       ).toFixed(2);
     },
-    count_payment() {
-      this.arrearage = this.total_price - this.payment;
+      count_payment() {
+      let arrearage_1 = (this.total_price - this.discount_amount - this.payment).toFixed(2);
+       if(arrearage_1 > 0){
+          this.arrearage = arrearage_1
+       }else{
+         this.arrearage = 0
+       }
     },
 
     count_arrearage() {
@@ -1001,6 +1010,11 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 </style>
 
 <style>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -76,21 +76,26 @@
             @click="checkPurchaseOrder"
             v-show="showOne">审核
          </el-button>
-
-         <!-- <el-button
+        
+        <el-button
+            size="small"
+            type="primary"
+            @click="toAdd"
+            v-if="is_check == 1">生成采购单
+         </el-button>
+         <el-button
             size="small"
             type="primary"
             @click="checkReturnOrder"
             v-if="is_check == 1">反审核
-         </el-button> -->
+         </el-button>
          
           <el-button
             size="small"
             type="primary"
             @click="updatePurchaseOrder"
-            v-show="showOne"
-            >保存</el-button
-          >
+            v-show="showThree">保存
+          </el-button>
         </div>
       </div>
 
@@ -104,7 +109,7 @@
           :data="recordInfo.tableList"
           :class="signAndWeighBoxPatients"
           border
-          style="width:100%"
+          style="width: 100%"
           max-height="450"
         >
           <el-table-column align="center" width="200">
@@ -145,7 +150,7 @@
                 v-model="scope.row.supply_type"
                 style="width: 120px"
                 :disabled="true"
-                 placeholder="商品类别"
+                placeholder="商品类别"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -206,7 +211,7 @@
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.supply_count'"
                 :rules="tableRules.supply_count"
-                 placeholder="请输入数量"
+                placeholder="请输入数量"
               >
                 <el-input
                   v-model="scope.row.supply_count"
@@ -224,7 +229,7 @@
                 v-model="scope.row.supply_price"
                 style="width: 80px"
                 :disabled="disabled"
-                 placeholder="请输入采购单价"
+                placeholder="请输入采购单价"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -233,6 +238,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>
 
@@ -317,18 +323,22 @@
             </template>
           </el-table-column>
         </el-table>
-         <div style="margin-top: 10px">
-        <el-input
-          type="textarea"
-          :rows="2"
-          placeholder="备注信息"
-          v-model="return_remark"
-        >
-        </el-input>
-       </div>
+        <div style="margin-top: 10px">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="备注信息"
+            v-model="return_remark"
+          >
+          </el-input>
+        </div>
         <!-- 审核水印 -->
-        <img src="@/assets/purchase/Reviewed.png" alt="正在加载..." class="reviewImg" v-show="Reviewed == true" />
-
+        <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">
@@ -351,9 +361,7 @@
           ></el-input
         ></span>
       </div>
-      
     </div>
-    
   </div>
 </template>
 
@@ -365,7 +373,8 @@ import {
   savePurchaseOrder,
   updatePurchaseOrder,
   checkPurchaseOrder,
-  getReturnOrder
+  getReturnOrder,
+  getAllOrderCountList
 } from "@/api/supply";
 import { getDataConfig } from "@/utils/data";
 export default {
@@ -376,13 +385,14 @@ export default {
   },
   data() {
     return {
-      Reviewed:false,
+      Reviewed: false,
       crumbs: [
         { path: false, name: "采购订单" },
         { path: "/spply/query", name: "新增采购订单" },
       ],
       showTwo: true,
       showOne: false,
+      showThree:false,
       recordInfo: {
         tableList: [],
       },
@@ -435,104 +445,143 @@ export default {
       ],
       goodList: [{ id: 1, name: "" }],
       total_price: 0,
-      return_remark:"",
-      is_check:2,
+      return_remark: "",
+      is_check: 2,
     };
   },
   methods: {
-   getInitOrder(){
-    getInitOrder().then(response=>{
-    if(response.data.state == 1){
-        var drugList = response.data.data.drugList
-        this.manufactuerList = response.data.data.manufactuerList
-        this.goodTypeList = response.data.data.goodTypeList
-        this.drugTypeList = response.data.data.drugTypeList
-        this.supplyList = response.data.data.supplyList
-       for(let i=0;i<drugList.length;i++){
-          for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
-            if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
-              drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+    getInitOrder() {
+      getInitOrder().then((response) => {
+        if (response.data.state == 1) {
+          var drugList = response.data.data.drugList;
+          this.manufactuerList = response.data.data.manufactuerList;
+          this.goodTypeList = response.data.data.goodTypeList;
+          this.drugTypeList = response.data.data.drugTypeList;
+          this.supplyList = response.data.data.supplyList;
+          for (let i = 0; i < drugList.length; i++) {
+            for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
+              if (
+                drugList[i].max_unit ==
+                drugList[i].drug_warehouse_info[z].max_unit
+              ) {
+                drugList[i].drug_warehouse_info[z].stock_max_number =
+                  drugList[i].drug_warehouse_info[z].stock_max_number *
+                  drugList[i].min_number;
+              }
             }
-          }
-        for(let j=0;j<this.manufactuerList.length;j++){
-            if(drugList[i].manufacturer == this.manufactuerList[j].id){
-                drugList[i].manufacturer = this.manufactuerList[j].manufacturer_name
+            for (let j = 0; j < this.manufactuerList.length; j++) {
+              if (drugList[i].manufacturer == this.manufactuerList[j].id) {
+                drugList[i].manufacturer =
+                  this.manufactuerList[j].manufacturer_name;
+              }
             }
-        }
-        for(let y=0;y<this.drugTypeList.length;y++){
-            if(drugList[i].drug_type == this.drugTypeList[y].value){
-            drugList[i].drug_type = this.drugTypeList[y].name
+            for (let y = 0; y < this.drugTypeList.length; y++) {
+              if (drugList[i].drug_type == this.drugTypeList[y].value) {
+                drugList[i].drug_type = this.drugTypeList[y].name;
+              }
             }
-        }
-        drugList[i].supply_name =  drugList[i].drug_name + " " + drugList[i].dose +drugList[i].dose_unit+"*"+drugList[i].min_number+ drugList[i].min_unit+"/"+drugList[i].max_unit + " " + drugList[i].manufacturer
-        drugList[i].supply_type = drugList[i].drug_type
-        drugList[i].supply_specification_name = drugList[i].dose +drugList[i].dose_unit+"*"+drugList[i].min_number+ drugList[i].min_unit+"/"+drugList[i].max_unit
-        drugList[i].supply_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number)
-        drugList[i].supply_count = ""
-        drugList[i].supply_total_price = ""
-        drugList[i].supply_manufacturer=  drugList[i].manufacturer
-        drugList[i].supply_license_number= drugList[i].number
-        drugList[i].supply_remake = ""
-        drugList[i].type = 1
-        drugList[i].supply_price = drugList[i].last_price
-        drugList[i].name = drugList[i].drug_name
-        if(drugList[i].max_unit!=drugList[i].min_unit){
-          drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
-        }
-        if(drugList[i].max_unit == drugList[i].min_unit){
-          drugList[i].unitList = [{id:1,name:""}]
-        }
-      
-        drugList[i].supply_unit = drugList[i].max_unit 
-        for(let j=0;j<drugList[i].unitList.length;j++){
-          if(drugList[i].max_unit!=drugList[i].min_unit){
-            drugList[i].unitList[0].name = drugList[i].max_unit
-            drugList[i].unitList[1].name = drugList[i].min_unit
-          }
-          if(drugList[i].max_unit ==drugList[i].min_unit){
-            drugList[i].unitList[0].name = drugList[i].max_unit
+            drugList[i].supply_name =
+              drugList[i].drug_name +
+              " " +
+              drugList[i].dose +
+              drugList[i].dose_unit +
+              "*" +
+              drugList[i].min_number +
+              drugList[i].min_unit +
+              "/" +
+              drugList[i].max_unit +
+              " " +
+              drugList[i].manufacturer;
+            drugList[i].supply_type = drugList[i].drug_type;
+            drugList[i].supply_specification_name =
+              drugList[i].dose +
+              drugList[i].dose_unit +
+              "*" +
+              drugList[i].min_number +
+              drugList[i].min_unit +
+              "/" +
+              drugList[i].max_unit;
+            drugList[i].supply_total = this.getWarehoseInfo(
+              drugList[i].drug_warehouse_info,
+              drugList[i].max_unit,
+              drugList[i].min_unit,
+              drugList[i].min_number
+            );
+            drugList[i].supply_count = "";
+            drugList[i].supply_total_price = "";
+            drugList[i].supply_manufacturer = drugList[i].manufacturer;
+            drugList[i].supply_license_number = drugList[i].number;
+            drugList[i].supply_remake = "";
+            drugList[i].type = 1;
+            drugList[i].supply_price = drugList[i].last_price;
+            drugList[i].name = drugList[i].drug_name;
+            if (drugList[i].max_unit != drugList[i].min_unit) {
+              drugList[i].unitList = [
+                { id: 1, name: "" },
+                { id: 2, name: "" },
+              ];
+            }
+            if (drugList[i].max_unit == drugList[i].min_unit) {
+              drugList[i].unitList = [{ id: 1, name: "" }];
+            }
+
+            drugList[i].supply_unit = drugList[i].max_unit;
+            for (let j = 0; j < drugList[i].unitList.length; j++) {
+              if (drugList[i].max_unit != drugList[i].min_unit) {
+                drugList[i].unitList[0].name = drugList[i].max_unit;
+                drugList[i].unitList[1].name = drugList[i].min_unit;
+              }
+              if (drugList[i].max_unit == drugList[i].min_unit) {
+                drugList[i].unitList[0].name = drugList[i].max_unit;
+              }
+            }
+            this.tabList.push(drugList[i]);
           }
-         
-        }
-        this.tabList.push(drugList[i])
-        }
-        this.drugList = drugList
-        var goodList =  response.data.data.goodList
-        for(let i=0;i<goodList.length;i++){
-        for(let j=0;j<this.manufactuerList.length;j++){
-            if(goodList[i].manufacturer == this.manufactuerList[j].id){
-                goodList[i].manufacturer = this.manufactuerList[j].manufacturer_name
+          this.drugList = drugList;
+          var goodList = response.data.data.goodList;
+          for (let i = 0; i < goodList.length; i++) {
+            for (let j = 0; j < this.manufactuerList.length; j++) {
+              if (goodList[i].manufacturer == this.manufactuerList[j].id) {
+                goodList[i].manufacturer =
+                  this.manufactuerList[j].manufacturer_name;
+              }
             }
-        }
-        for(let y=0;y<this.goodTypeList.length;y++){
-            if(goodList[i].good_type_id == this.goodTypeList[y].id){
-                goodList[i].good_type_id = this.goodTypeList[y].type_name
+            for (let y = 0; y < this.goodTypeList.length; y++) {
+              if (goodList[i].good_type_id == this.goodTypeList[y].id) {
+                goodList[i].good_type_id = this.goodTypeList[y].type_name;
+              }
             }
+            goodList[i].supply_name =
+              goodList[i].good_name +
+              " " +
+              goodList[i].specification_name +
+              " " +
+              goodList[i].manufacturer;
+            goodList[i].supply_type = goodList[i].good_type_id;
+            goodList[i].supply_specification_name =
+              goodList[i].specification_name;
+            goodList[i].supply_price = goodList[i].buy_price;
+            goodList[i].supply_total = this.getTotalStockCount(
+              goodList[i].good_warehouse_info
+            );
+            goodList[i].supply_count = "";
+            goodList[i].supply_total_price = "";
+            goodList[i].supply_manufacturer = goodList[i].manufacturer;
+            goodList[i].supply_license_number = goodList[i].number;
+            goodList[i].supply_remake = "";
+            goodList[i].type = 2;
+            goodList[i].name = goodList[i].good_name;
+            goodList[i].unitList = [{ id: 1, name: "" }];
+            goodList[i].supply_unit = goodList[i].packing_unit;
+            for (let j = 0; j < goodList[i].unitList.length; j++) {
+              goodList[i].unitList[0].name = goodList[i].packing_unit;
+            }
+            this.tabList.push(goodList[i]);
+          }
+          this.goodList = goodList;
         }
-        goodList[i].supply_name = goodList[i].good_name + " " + goodList[i].specification_name + " " +goodList[i].manufacturer
-        goodList[i].supply_type = goodList[i].good_type_id
-        goodList[i].supply_specification_name =goodList[i].specification_name
-        goodList[i].supply_price = goodList[i].buy_price
-        goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info)
-        goodList[i].supply_count = ""
-        goodList[i].supply_total_price = ""
-        goodList[i].supply_manufacturer = goodList[i].manufacturer
-        goodList[i].supply_license_number = goodList[i].number
-        goodList[i].supply_remake = ""
-        goodList[i].type = 2
-        goodList[i].name = goodList[i].good_name
-        goodList[i].unitList =  [{id:1,name:""}]
-        goodList[i].supply_unit = goodList[i].packing_unit
-        for(let j=0;j<goodList[i].unitList.length;j++){
-           goodList[i].unitList[0].name = goodList[i].packing_unit 
-        }
-        this.tabList.push(goodList[i])
-        }
-        this.goodList = goodList
-        
-    } 
-    })
-},
+      });
+    },
     changeGoodName(val) {
       this.currentIndex = val;
     },
@@ -638,10 +687,9 @@ export default {
           var end = this.getTimes(this.end_time);
           const params = {
             stockIn: this.recordInfo.tableList,
-            return_remake:this.return_remark,
+            return_remake: this.return_remark,
           };
 
-         
           savePurchaseOrder(
             params,
             this.supplier_name,
@@ -655,15 +703,14 @@ 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.is_check = warehouseInfo.is_check;
+              if (warehouseInfo.is_check == 1) {
+                this.Reviewed = true;
               }
               this.number = warehouseInfo.number;
               this.id = warehouseInfo.id;
               this.recordInfo.tableList = [];
-              this.return_remark = warehouseInfo.return_remake
+              this.return_remark = warehouseInfo.return_remake;
               var orderInfo = response.data.data.orderInfo;
               for (let i = 0; i < orderInfo.length; i++) {
                 if (orderInfo[i].is_source == 1) {
@@ -694,29 +741,30 @@ export default {
                 orderInfo[i].project_id = orderInfo[i].project_id;
                 orderInfo[i].supply_unit = orderInfo[i].supply_unit;
               }
-            
+
               this.recordInfo.tableList = orderInfo;
-              for(let i=0;i<orderInfo.length;i++){
-                 orderInfo[i].name = ""
-                 orderInfo[i].supply_name = ""
-                 orderInfo[i].supply_specification_name = ""
-                if(orderInfo[i].is_source == 1){
-                  for(let j=0;j<this.drugList.length;j++){
-                     if(orderInfo[i].project_id == this.drugList[j].id){
-                        orderInfo[i].name = this.drugList[j].drug_name
-                     }
+              for (let i = 0; i < orderInfo.length; i++) {
+                orderInfo[i].name = "";
+                orderInfo[i].supply_name = "";
+                orderInfo[i].supply_specification_name = "";
+                if (orderInfo[i].is_source == 1) {
+                  for (let j = 0; j < this.drugList.length; j++) {
+                    if (orderInfo[i].project_id == this.drugList[j].id) {
+                      orderInfo[i].name = this.drugList[j].drug_name;
+                    }
                   }
                 }
-                if(orderInfo[i].is_source == 2){
-                  for(let y=0;y<this.goodList.length;y++){
-                     if(orderInfo[i].project_id = this.goodList[y].id){
-                        orderInfo[i].name = this.goodList[y].good_name
-                     }
+                if (orderInfo[i].is_source == 2) {
+                  for (let y = 0; y < this.goodList.length; y++) {
+                    if ((orderInfo[i].project_id = this.goodList[y].id)) {
+                      orderInfo[i].name = this.goodList[y].good_name;
+                    }
                   }
                 }
               }
               this.showTwo = false;
               this.showOne = true;
+              this.showThree = true
             }
           });
         }
@@ -728,7 +776,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+arr[i].stock_min_number);
+          total += parseInt(arr[i].stock_max_number + arr[i].stock_min_number);
         }
       }
       if (total < min_number) {
@@ -807,9 +855,8 @@ export default {
           var end = this.getTimes(this.end_time);
           const params = {
             stockIn: this.recordInfo.tableList,
-            return_remake:this.return_remark,
+            return_remake: this.return_remark,
           };
-         
 
           updatePurchaseOrder(
             params,
@@ -838,9 +885,10 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
+      this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
       return total_price.toFixed(2);
     },
-     count_discount() {
+    count_discount() {
       this.rate_of_concession = (
         this.discount_amount /
         (this.total_price * 0.01)
@@ -857,9 +905,12 @@ export default {
             if (response.data.state == 1) {
               var info = response.data.data.info;
               this.is_check = info.is_check
+              this.showOne = false
+              this.showTwo = false
+              this.showThree = true
               this.disabled = true;
               this.$message.success("审核成功!");
-              this.Reviewed = true
+              this.Reviewed = true;
             }
           });
         })
@@ -888,12 +939,112 @@ export default {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
           this.disabled = false;
-          this.showOne = true
-          this.is_check =2 
+          this.showOne = true;
+          this.is_check = 2;
           this.$message.success("反审核成功!");
         }
       });
     },
+     toAdd() {
+      if (this.is_check == 2) {
+        this.$message.error("该采购订单未审核,不能生成采购数据!");
+        return false;
+      }
+      //获取商品购货订单 和 购货单的总数量
+      getAllOrderCountList(this.id).then((response) => {
+        if (response.data.state == 1) {
+          var purcaseOrder = response.data.data.purcaseOrder;
+
+          var goodOrder = response.data.data.goodOrder;
+         
+          var drugList = response.data.data.drugList;
+      
+          var ids = "";
+          // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
+          if (goodOrder.length == 0) {
+            this.$router.push({path: "/good/order/add?id=" + this.id + "&ids=" + ids});
+          }
+          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]);
+                }
+              }
+            }
+     
+
+            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.$message.error("该订单已全部生成采购单，请知悉!");
+                return;
+              }
+
+              if (arr.length >0) {
+                str = arr.join(",");
+                this.$router.push({path: "/good/order/add?id=" + this.id + "&ids=" + str});
+              }
+            }
+          }
+        }
+      });
+    },
   },
 
   created() {
@@ -945,7 +1096,7 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
-.reviewImg{
+.reviewImg {
   position: fixed;
   left: 50%;
   transform: translateX(-50%);
@@ -953,8 +1104,8 @@ export default {
 }
 
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-width:10px;
-height:10px;
+  width: 10px;
+  height: 10px;
 }
 </style>
 

src/xt_pages/supply/components/addSupply.vue

@@ -92,14 +92,14 @@
           <!-- 联系人填写 -->
           <el-table-column label="联系人" align="center" width="130">
             <template slot="header" slot-scope="scope">
-              <span>联系人<span style="color: red">*</span></span>
+              <span>联系人</span>
             </template>
             <!-- tableRules.name -->
             <template slot-scope="scope">
               <el-form-item
                 :prop="'contacts.' + scope.$index + '.name'"
                 :rules="
-                  scope.row.name != ''
+                  scope.row.name == ''
                     ? [
                         {
                           required: 'true',
@@ -318,8 +318,11 @@ export default {
         this.title = "编辑供应商";
         this.supplier.supplierCode = data.SupplierCode;
         this.supplier.supplierName = data.SupplierName;
-        this.supplier.supplierType = data.SupplierType;
-
+        if (data.SupplierType == 0){
+          this.supplier.supplierType = ""
+        }else {
+          this.supplier.supplierType = data.SupplierType;
+        }
         this.supplier.vatRate = data.VatRate;
         this.supplier.number = data.Number;
         this.supplier.bank = data.Bank;

src/xt_pages/supply/components/editGoodOrder.vue

@@ -12,8 +12,9 @@
           align-items: center;
         "
       >
-        <div style="display: flex;">
-          <span style="color: red">*</span><span>供应商:</span>
+        <div style="display: flex; align-items: center">
+          <div><span style="color: red">*</span><span>供应商:</span></div>
+          <!-- <div>供应商:</div> -->
           <el-select
             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
@@ -42,15 +43,12 @@
             value-format="yyyy-MM-dd"
             :disabled="disabled"
           ></el-date-picker>
-    
+
           <span>单据编码:{{ good_number }}</span>
         </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
-          >
+         <div style="display: flex;" >
+           <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
           <el-button
             size="small"
             type="primary"
@@ -239,6 +237,18 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="拆零零售价" align="center" width="180px">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.min_price"
+                style="width: 140px"
+                :disabled="disabled"
+                placeholder="请输入拆零零售价"
+              ></el-input>
+              <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="采购单价" align="center" width="180px">
             <template slot-scope="scope">
               <el-input
@@ -251,6 +261,8 @@
             </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) }}
@@ -265,7 +277,6 @@
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.supply_product_date'"
                 :rules="tableRules.supply_product_date"
-
               >
                 <el-date-picker
                   prefix-icon="el-icon-date"
@@ -379,7 +390,7 @@
             :rows="2"
             placeholder="备注信息"
             v-model="return_remark"
-           :disabled="disabled"
+            :disabled="disabled"
           >
           </el-input>
         </div>
@@ -435,12 +446,20 @@
         ></span>
       </div>
     </div>
-    <popup ref="Popup" :content="content" :content_1="content_1" :content_2="content_2" :number="number" :orderList ="orderList" :type="type"></popup>
+    <popup
+      ref="Popup"
+      :content="content"
+      :content_1="content_1"
+      :content_2="content_2"
+      :number="number"
+      :orderList="orderList"
+      :type="type"
+    ></popup>
   </div>
 </template>
 
 <script>
-import popup from "./Popup"
+import popup from "./Popup";
 import Computed from "../../components/Computed/index_1.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { uParseTime } from "@/utils/tools";
@@ -454,7 +473,7 @@ import {
   MofyGoodOrder,
   UpdateSupplyWahouseingInfo,
   getSupplyWarehouseOutById,
-  deleteGoodOrderById
+  deleteGoodOrderById,
 } from "@/api/supply";
 
 export default {
@@ -470,17 +489,15 @@ export default {
         { path: false, name: "采购单" },
         { path: "/supply/good/order/query", name: "编辑采购单" },
       ],
-      content_2:"退库单",
-      content:"采购单",
-      content_1:"已有以下关联数据,不能反审核",
-      type:2,
-      orderList:[],
+      content_2: "退库单",
+      content: "采购单",
+      content_1: "已有以下关联数据,不能反审核",
+      type: 2,
+      orderList: [],
       showOne: true,
       showTwo: false,
       showThree: false,
-      recordInfo: {
-        tableList: [],
-      },
+      recordInfo: {tableList: []},
       keywords: "",
       total: 0,
       multipleSelection: [],
@@ -490,7 +507,7 @@ export default {
       page: 1,
       limit: 10,
       goodType: [],
-       Reviewed: false,
+      Reviewed: false,
       goodInfo: [],
       org_id: 0,
       types: [],
@@ -539,15 +556,14 @@ export default {
       orderInfo: [],
       warese_out_id: 0,
       return_remark: "",
-      tableDataList:[],
+      tableDataList: [],
     };
   },
 
-  watch(){
-      // total_price:function(newval,oldval){
-      //   console.log(newval,'op')
-      // }
-
+  watch() {
+    // total_price:function(newval,oldval){
+    //   console.log(newval,'op')
+    // }
   },
 
   methods: {
@@ -581,10 +597,33 @@ export default {
                 drugList[i].drug_type = this.drugTypeList[y].name;
               }
             }
-            drugList[i].supply_name =drugList[i].drug_name +" " +drugList[i].dose +drugList[i].dose_unit +"*" +drugList[i].min_number +drugList[i].min_unit +"/" +drugList[i].max_unit +" " +drugList[i].manufacturer;
+            drugList[i].supply_name =
+              drugList[i].drug_name +
+              " " +
+              drugList[i].dose +
+              drugList[i].dose_unit +
+              "*" +
+              drugList[i].min_number +
+              drugList[i].min_unit +
+              "/" +
+              drugList[i].max_unit +
+              " " +
+              drugList[i].manufacturer;
             drugList[i].supply_type = drugList[i].drug_type;
-            drugList[i].supply_specification_name =drugList[i].dose + drugList[i].dose_unit +"*" +drugList[i].min_number +drugList[i].min_unit +"/" +drugList[i].max_unit;
-            drugList[i].supply_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number);
+            drugList[i].supply_specification_name =
+              drugList[i].dose +
+              drugList[i].dose_unit +
+              "*" +
+              drugList[i].min_number +
+              drugList[i].min_unit +
+              "/" +
+              drugList[i].max_unit;
+            drugList[i].supply_total = this.getWarehoseInfo(
+              drugList[i].drug_warehouse_info,
+              drugList[i].max_unit,
+              drugList[i].min_unit,
+              drugList[i].min_number
+            );
             drugList[i].supply_count = "";
             drugList[i].supply_total_price = "";
             drugList[i].supply_manufacturer = drugList[i].manufacturer;
@@ -593,6 +632,7 @@ export default {
             drugList[i].type = 1;
             drugList[i].supply_price = drugList[i].last_price;
             drugList[i].name = drugList[i].drug_name;
+            drugList[i].min_price = drugList[i].min_price
             if (drugList[i].max_unit != drugList[i].min_unit) {
               drugList[i].unitList = [
                 { id: 1, name: "" },
@@ -631,11 +671,19 @@ 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].manufacturer;
+            goodList[i].supply_name =
+              goodList[i].good_name +
+              " " +
+              goodList[i].specification_name +
+              " " +
+              goodList[i].manufacturer;
             goodList[i].supply_type = goodList[i].good_type_id;
-            goodList[i].supply_specification_name =goodList[i].specification_name;
+            goodList[i].supply_specification_name =
+              goodList[i].specification_name;
             goodList[i].supply_price = goodList[i].buy_price;
-            goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info);
+            goodList[i].supply_total = this.getTotalStockCount(
+              goodList[i].good_warehouse_info
+            );
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
@@ -647,6 +695,7 @@ export default {
             goodList[i].supply_unit = goodList[i].packing_unit;
             goodList[i].warehouse_info_id = 0;
             goodList[i].warehousing_id = 0;
+            goodList[i].min_price = goodList[i].retail_price
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
@@ -667,10 +716,9 @@ export default {
           this.recordInfo.tableList[i].name = val.name;
           this.recordInfo.tableList[i].supply_name = val.supply_name;
           this.recordInfo.tableList[i].supply_type = val.supply_type;
-          this.recordInfo.tableList[i].supply_specification_name =
-            val.supply_specification_name;
+          this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
-
+          this.recordInfo.tableList[i].min_price = val.min_price  
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
           } else {
@@ -700,6 +748,10 @@ export default {
       }
     },
     handleEdit() {
+      if (this.is_check == 1) {
+        this.$message.error("已审核的不能新增!");
+        return false;
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["name"] = "";
@@ -726,41 +778,43 @@ export default {
       tempObj["warehousing_id"] = "";
       tempObj["number"] = "";
       tempObj["good_number"] = "";
+      tempObj["min_price"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
-      if(this.is_check == 1){
-        this.$message.error("已审核单据，不能删除!")
-        return false
+      if (this.is_check == 1) {
+        this.$message.error("已审核单据，不能删除!");
+        return false;
       }
-      if(row.id == 0){
+      if (row.id == 0) {
         if (this.recordInfo.tableList.length <= 1) {
-        this.$message.error("只有一条记录的时候无法删除");
-        return;
+          this.$message.error("只有一条记录的时候无法删除");
+          return;
+        } else {
+          this.recordInfo.tableList.splice(index, 1);
+        }
       } else {
-        this.recordInfo.tableList.splice(index, 1);
-       }
-      }else{
-         const params = {
-            id: row.id
-          }
-          this.$confirm('确认删除吗?', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            deleteGoodOrderById(params).then(response => {
+        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
+                this.$message.error(response.data.msg);
+                return false;
               } else {
-                this.$message.success('删除成功')
+                this.$message.success("删除成功");
 
-                this.recordInfo.tableList.splice(index, 1)
+                this.recordInfo.tableList.splice(index, 1);
               }
-            })
-          }).catch(() => {
-        })
+            });
+          })
+          .catch(() => {});
       }
     },
 
@@ -821,10 +875,10 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
-      this.addressChange()
+      this.addressChange();
       return total_price.toFixed(2);
     },
-       addressChange() {
+    addressChange() {
       var discount_amount = 0;
       if (this.rate_of_concession > 0) {
         discount_amount = (
@@ -841,24 +895,34 @@ export default {
       ).toFixed(2);
     },
     count_payment() {
-      this.arrearage = this.total_price - this.payment;
+      let arrearage_1 = (
+        this.total_price -
+        this.discount_amount -
+        this.payment
+      ).toFixed(2);
+      if (arrearage_1 > 0) {
+        this.arrearage = arrearage_1;
+      } else {
+        this.arrearage = 0;
+      }
     },
 
     count_arrearage() {
-      this.payment = this.total_price - this.arrearage;
+      this.payment = (this.total_price - this.arrearage).toFixed(2);
     },
     checkPurchaseOrder(id, index) {
       this.$confirm("是否审核?", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      }).then(() => {
+      })
+        .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();
+              // this.getPurchaseOrderDetail();
             }
           });
         })
@@ -874,7 +938,7 @@ export default {
             this.showOne = false;
             this.showTwo = true;
             this.showThree = true;
-            this.disabled = true
+            this.disabled = true;
             this.Reviewed = true;
           }
 
@@ -893,6 +957,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].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
@@ -900,9 +965,7 @@ export default {
             orderInfo[i].project_id = orderInfo[i].project_id;
             orderInfo[i].supply_unit = orderInfo[i].supply_unit;
             orderInfo[i].order_number = orderInfo[i].order_number;
-            orderInfo[i].supply_total_price = (
-              orderInfo[i].count * orderInfo[i].price
-            ).toFixed(2);
+            orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2);
             orderInfo[i].supply_expiry_date = this.getTimes(
               orderInfo[i].supply_expiry_date
             );
@@ -936,13 +999,46 @@ export default {
               }
             }
           }
+          if(orderInfo.length == 0){
+            const tempObj = {};
+            tempObj["id"] = 0;
+            tempObj["name"] = "";
+            tempObj["supply_name"] = "";
+            tempObj["supply_type"] = "";
+            tempObj["supply_specification_name"] = "";
+            tempObj["supply_total"] = "";
+            tempObj["supply_count"] = "";
+            tempObj["supply_price"] = "";
+            tempObj["supply_total_price"] = "";
+            tempObj["supply_manufacturer"] = "";
+            tempObj["supply_license_number"] = "";
+            tempObj["supply_remake"] = "";
+            tempObj["type"] = 0;
+            tempObj["is_total"] = 1;
+            tempObj["project_id"] = 0;
+            tempObj["supply_unit"] = "";
+            tempObj["supply_batch_number"] = "";
+            tempObj["supply_product_date"] = "";
+            tempObj["order_number"] = "";
+            tempObj["supply_expiry_date"] = "";
+            tempObj["manufacturer_id"] = "";
+            tempObj["warehouse_info_id"] = "";
+            tempObj["warehousing_id"] = "";
+            tempObj["number"] = "";
+            tempObj["good_number"] = "";
+            tempObj["min_price"] = ""
+            this.recordInfo.tableList = [];
+            this.recordInfo.tableList.push(tempObj);
+          }else{
+            this.recordInfo.tableList = [];
+            this.recordInfo.tableList = orderInfo;
+            this.tableDataList = []
 
           this.recordInfo.tableList = [];
           this.recordInfo.tableList = orderInfo;
-          this.tableDataList = []
-          this.tableDataList = orderInfo
-
-        }
+          this.tableDataList = [];
+          this.tableDataList = orderInfo;
+        }}
       });
     },
     toPrint() {
@@ -959,16 +1055,27 @@ 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_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_price =
+          this.recordInfo.tableList[i].supply_price.toString();
+        this.recordInfo.tableList[i].supply_total_price =
+          this.recordInfo.tableList[i].supply_total_price.toString();
+        this.recordInfo.tableList[i].supply_total =
+          this.recordInfo.tableList[i].supply_total.toString();
 
         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].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;
+          if (
+            this.recordInfo.tableList[i].supply_manufacturer ==
+            this.manufactuerList[j].id
+          ) {
+            this.recordInfo.tableList[i].supply_manufacturer =
+              this.manufactuerList[j].manufacturer_name;
           }
         }
       }
@@ -980,19 +1087,20 @@ export default {
           var params = {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
-          }
+          };
           //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
 
-          if(this.tableDataList.length != this.recordInfo.tableList){
-             warehousing_id = 0
+          if(this.tableDataList.length != this.recordInfo.tableList.length){
+            
              for(let i=0;i<this.recordInfo.tableList.length;i++){
-              this.recordInfo.tableList[i].id = 0
-              this.recordInfo.tableDataList[i].order_number = ""
+              this.recordInfo.tableList[i].warehousing_id = 0
+              this.recordInfo.tableList[i].warehouse_info_id = 0
+              this.recordInfo.tableList[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;
@@ -1005,14 +1113,17 @@ export default {
     checkGoodOrder() {
       var id = this.$route.query.id;
       var warehousing_id = this.$route.query.warehousing_id;
+      console.log("采购单ID",id)
+      console.log("采购订单ID",warehousing_id)
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
-          this.is_check = 1
+          this.is_check = 1;
           this.showOne = false;
           this.showTwo = true;
           this.showThree = true;
           var purcaseOrder = response.data.data.purcaseOrder;
+          this.Reviewed = true;
           console.log("采购订单", purcaseOrder);
 
           var goodOrder = response.data.data.goodOrder;
@@ -1035,7 +1146,8 @@ 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;
                 }
               }
             }
@@ -1081,20 +1193,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)
+              console.log("审核23232323323", arr);
               if (arr.length == 0) {
-                 is_warehouse = 1;
+                is_warehouse = 1;
                 this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
               }
 
               //部分入库
-              if (arr.length >0) {
+              if (arr.length > 0) {
                 //修改订购单
                 is_warehouse = 3;
                 this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
@@ -1126,46 +1238,51 @@ export default {
         if (response.data.state == 1) {
           var cancelList = response.data.data.cancelList;
           console.log("退库单", cancelList);
-           var drugList = response.data.data.drugList;
+          var drugList = response.data.data.drugList;
           console.log("药品列表", drugList);
           var cancelOrderList = response.data.data.cancelOrderList;
           console.log("退库单详情", cancelOrderList);
-          var ids =""
-          if(cancelList.length == 0){
-            this.$router.push({ path: "/good/return/add?id=" + this.id+"&ids="+ids });
+          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++){
-                  if(outList[i].project_id == drugList[j].id){
-                    if(outList[i].supply_unit == drugList[j].max_unit){
-                      outList[i].count = outList[i].count * drugList[j].min_number
+            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++) {
+                  if (outList[i].project_id == drugList[j].id) {
+                    if (outList[i].supply_unit == drugList[j].max_unit) {
+                      outList[i].count =
+                        outList[i].count * drugList[j].min_number;
                     }
-
                   }
                 }
               }
             }
 
-            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].project_id == drugList[j].id){
-                    if(cancelOrderList[i].supply_unit == drugList[j].max_unit){
-                      cancelOrderList[i].count = cancelOrderList[i].count * drugList[j].min_number
+            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].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)
+            console.log("数据变了后23323233", outList);
 
             let objInfo = {};
-            if(cancelOrderList.length >0){
+            if (cancelOrderList.length > 0) {
               cancelOrderList.forEach((item, index) => {
                 let { project_id } = item;
                 if (!objInfo[project_id]) {
@@ -1176,57 +1293,56 @@ export default {
                   };
                 }
               });
-              let newArr = Object.values(objInfo)
-              console.log("最好的输3233232323323223", newArr)
-              console.log("数据变了后23323233",cancelOrderList)
+              let newArr = Object.values(objInfo);
+              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])
+                    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;
+              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 < outList.length; i++) {
-                for (let j = 0; j < newArr.length; j++) {
-                  if (outList[i].project_id == newArr[j].project_id) {
-                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示退货单的数量未满足采购单的数据，可以继续生成退货单
-                    if (outList[i].count > newArr[j].count) {
-                       arr.push(outList[i].project_id);
+              var arr = [];
+              var total = 0;
+              var str = "";
+              //如果采购单有数据，则需要比较数量
+              if (newArr.length > 0) {
+                for (let i = 0; i < outList.length; i++) {
+                  for (let j = 0; j < newArr.length; j++) {
+                    if (outList[i].project_id == newArr[j].project_id) {
+                      //根据商品ID比较数量大小,把数量不足的商品ID储存,表示退货单的数量未满足采购单的数据，可以继续生成退货单
+                      if (outList[i].count > newArr[j].count) {
+                        arr.push(outList[i].project_id);
+                      }
                     }
                   }
                 }
-              }
-              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
+                //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
 
-              if (arr.length == 0) {
-                this.$message.error("该订单已全部生成退库单，请知悉!");
-                return
-              }
-              console.log("arr23323232232323",arr)
-              if (arr.length > 0) {
-                str = arr.join(",");
-                this.$router.push({ path: "/good/return/edit?id=" + id + "&ids=" + str});
+                if (arr.length == 0) {
+                  this.$message.error("该订单已全部生成退库单，请知悉!");
+                  return;
+                }
+                console.log("arr23323232232323", arr);
+                if (arr.length > 0) {
+                  str = arr.join(",");
+                  this.$router.push({
+                    path: "/good/return/edit?id=" + id + "&ids=" + str,
+                  });
+                }
               }
-             }
-
+            }
           }
-         }
         }
       });
-
     },
     //反审核
     MofyGoodOrder() {
@@ -1241,14 +1357,16 @@ export default {
           var msg = response.data.data.msg;
           if (msg == 1) {
             this.$message.success("反审核成功!");
+            this.disabled = false
+            this.Reviewed = false
             return
           }
           if (msg == 2) {
-            var cancelList = response.data.data.cancelList
-            console.log("cancelLIST2332322332232323",cancelList)
-            this.orderList = cancelList
-            this.$refs.Popup.dialogVisible = true
-            return
+            var cancelList = response.data.data.cancelList;
+            console.log("cancelLIST2332322332232323", cancelList);
+            this.orderList = cancelList;
+            this.$refs.Popup.dialogVisible = true;
+            return;
           }
 
           var purcaseOrder = response.data.data.purcaseOrder;
@@ -1260,13 +1378,16 @@ 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++) {
               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;
+                  purcaseOrder[i].count =
+                    purcaseOrder[i].count * drugList[j].min_number;
                 }
               }
             }
@@ -1276,7 +1397,8 @@ 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;
                 }
               }
             }
@@ -1376,6 +1498,7 @@ export default {
     tempObj["warehousing_id"] = "";
     tempObj["number"] = "";
     tempObj["good_number"] = "";
+    tempObj["min_price"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     if (parseInt(this.$route.query.id) > 0) {
@@ -1412,6 +1535,10 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 </style>
 
 <style>

src/xt_pages/supply/components/editGoodReturn.vue

@@ -59,9 +59,23 @@
           <span>单据编码:{{ number }}</span>
         </div>
         <div>
-          <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"
+            v-if="is_check == 2"
+            >审核</el-button
+          >
+          <el-button
+            size="small"
+            type="primary"
+            @click="modefyReturnOrder"
+            v-if="is_check == 1"
+            >反审核</el-button
+          >
         </div>
       </div>
 
@@ -118,6 +132,7 @@
                 :disabled="true"
                 placeholder="商品类别"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="规格&单位" align="center" width="200px">
@@ -128,6 +143,7 @@
                 :disabled="true"
                 placeholder="规格&单位"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -164,6 +180,7 @@
                 style="width: 100px"
                 :disabled="true"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
           <el-table-column label="可退数量" align="center" width="200px">
@@ -173,6 +190,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">
@@ -202,23 +220,27 @@
                 :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>
           <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="120px">
             <template slot-scope="scope">
               {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -229,6 +251,7 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -239,6 +262,7 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -249,6 +273,7 @@
                 style="width: 160px"
                 :disabled="true"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -260,6 +285,7 @@
                 :disabled="disabled"
                 placeholder="请输入备注"
               ></el-input>
+              <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
@@ -311,6 +337,13 @@
         >
         </el-input>
       </div>
+        <!-- 审核水印 -->
+        <img
+          src="@/assets/purchase/Reviewed.png"
+          alt="正在加载..."
+          class="reviewImg"
+          v-show="Reviewed == true"
+        />
       <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
       <div style="margin-top: 10px">
         <span
@@ -375,7 +408,7 @@ import {
   updateGoodReturn,
   checkReturnOrder,
   deleteReturnOrderById,
-  modefyReturnOrder
+  modefyReturnOrder,
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -387,7 +420,7 @@ export default {
       tipsInfo: "",
       crumbs: [
         { path: false, name: "退货单" },
-        { path: "/good/return/add", name: "新增退货单" },
+        { path: "/good/return/add", name: "编辑退货单" },
       ],
       showTwo: true,
       showOne: false,
@@ -410,6 +443,7 @@ export default {
       form: {
         manufacturer_id: "",
       },
+      Reviewed:false,
       tabList: [],
       manufactuerList: [],
       currentIndex: 0,
@@ -599,6 +633,10 @@ export default {
       }
     },
     handleEdit() {
+      if (this.is_check == 1) {
+        this.$message.error("已审核的不能新增!");
+        return false;
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["name"] = "";
@@ -616,17 +654,17 @@ 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"] = ""
+      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(row.id == 0){
+      if (row.id == 0) {
         if (this.recordInfo.tableList.length <= 1) {
           this.$message.error("只有一条记录的时候无法删除");
           return;
@@ -634,29 +672,29 @@ export default {
           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
+      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("删除失败")
-            }
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error("删除失败");
+              }
+            });
           })
-        }).catch(() => {
-       })
+          .catch(() => {});
       }
-
     },
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
@@ -791,9 +829,15 @@ export default {
         this.discount_amount /
         (this.total_price * 0.01)
       ).toFixed(2);
+
     },
     count_payment() {
-      this.arrearage = this.total_price - this.payment;
+      let arrearage_1 = (this.total_price - this.discount_amount - this.payment).toFixed(2);
+      if (arrearage_1 > 0) {
+        this.arrearage = arrearage_1;
+      } else {
+        this.arrearage = 0;
+      }
     },
 
     count_arrearage() {
@@ -818,66 +862,69 @@ export default {
         })
         .catch(() => {});
     },
-   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
-          this.rate_of_concession = out.rate_of_concession
-          this.discount_amount = out.discount_amount
-          this.payment = out.payment
-          this.arrearage = out.arrearage
-          this.start_time = this.getTimes(out.document_date)
-          var orderInfo = response.data.data.orderCancelDetail
-          if(out.is_check == 1){
-            this.disabled = true
+    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;
+          this.rate_of_concession = out.rate_of_concession;
+          this.discount_amount = out.discount_amount;
+          this.payment = out.payment;
+          this.arrearage = out.arrearage;
+          this.start_time = this.getTimes(out.document_date);
+          var orderInfo = response.data.data.orderCancelDetail;
+          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
-              orderInfo[i].project_id =  orderInfo[i].project_id
-              orderInfo[i].supply_unit =  orderInfo[i].supply_unit
-              orderInfo[i].order_number =  orderInfo[i].order_number
-              orderInfo[i].good_number = orderInfo[i].good_number
-              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
-            if(orderInfo[i].is_source == 1){
-              for(let j=0;j<drugList.length;j++){
-                  if( orderInfo[i].project_id == drugList[j].id){
-                    if(drugList[j].max_unit!=drugList[j].min_unit){
-                      orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                      orderInfo[i].unitList[0].name = drugList[j].max_unit
-                      orderInfo[i].unitList[1].name = drugList[j].min_unit
-                    }
-                    if(drugList[j].max_unit ==drugList[j].min_unit){
-                      orderInfo[i].unitList = [{id:1,name:""}]
-                      orderInfo[i].unitList[0].name = drugList[j].max_unit
-                    }
-
+          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;
+            orderInfo[i].project_id = orderInfo[i].project_id;
+            orderInfo[i].supply_unit = orderInfo[i].supply_unit;
+            orderInfo[i].order_number = orderInfo[i].order_number;
+            orderInfo[i].good_number = orderInfo[i].good_number;
+            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;
+            if (orderInfo[i].is_source == 1) {
+              for (let j = 0; j < drugList.length; j++) {
+                if (orderInfo[i].project_id == drugList[j].id) {
+                  if (drugList[j].max_unit != drugList[j].min_unit) {
+                    orderInfo[i].unitList = [
+                      { id: 1, name: "" },
+                      { id: 2, name: "" },
+                    ];
+                    orderInfo[i].unitList[0].name = drugList[j].max_unit;
+                    orderInfo[i].unitList[1].name = drugList[j].min_unit;
                   }
-              }
-              }
-            if(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
+                  if (drugList[j].max_unit == drugList[j].min_unit) {
+                    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;
+                }
               }
             }
           }
@@ -891,66 +938,87 @@ export default {
       var id = this.$route.query.id;
       this.$router.push({ path: "/purchase/order/print?&id=" + id });
     },
-    updateGoodReturn(){
+    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();
+            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("保存成功!");
-             }
-          })
-
+            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("保存成功!");
+            }
+          });
         }
-      })
+      });
     },
-    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("审核成功!")
-       }
-     })
+    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){
-         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) {
+          this.loading = false;
+          var msg = response.data.data.msg;
+          this.$message.success("反审核成功!");
+        }
+      });
     },
   },
   created() {
@@ -971,12 +1039,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"] = ""
+    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();
     //获取购货单列表
@@ -1010,6 +1078,11 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 </style>
 
 <style>
@@ -1040,4 +1113,10 @@ export default {
   bottom: 20px;
   height: 100%;
 }
+.reviewImg {
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 30%;
+}
 </style>

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -12,7 +12,7 @@
           align-items: center;
         "
       >
-        <div>
+        <div style="display:flex;align-items: center;">
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
@@ -317,6 +317,7 @@
             :rows="2"
             placeholder="备注信息"
             v-model="return_remark"
+            :disabled="disabled"
           >
           </el-input>
         </div>
@@ -894,7 +895,30 @@ export default {
           }
          
           this.recordInfo.tableList = [];
-          this.recordInfo.tableList = orderInfo;
+          if(orderInfo.length == 0){
+              const tempObj = {};
+              tempObj["id"] = 0;
+              tempObj["name"] = "";
+              tempObj["supply_name"] = "";
+              tempObj["supply_type"] = "";
+              tempObj["supply_specification_name"] = "";
+              tempObj["supply_total"] = "";
+              tempObj["supply_count"] = "";
+              tempObj["supply_price"] = "";
+              tempObj["supply_total_price"] = "";
+              tempObj["supply_manufacturer"] = "";
+              tempObj["supply_license_number"] = "";
+              tempObj["supply_remake"] = "";
+              tempObj["type"] = 0;
+              tempObj["is_total"] = 1;
+              tempObj["project_id"] = 0;
+              tempObj["supply_unit"] = "";
+              tempObj["manufacturer_id"] = "";
+              this.recordInfo.tableList.push(tempObj);
+          }else{
+            this.recordInfo.tableList = orderInfo;
+          }
+         
         }
       });
     },
@@ -1100,6 +1124,10 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 </style>
 
 <style>
@@ -1136,4 +1164,6 @@ export default {
   transform: translateX(-50%);
   top: 30%;
 }
+
+
 </style>

src/xt_pages/supply/goodOrderQuery.vue

@@ -407,6 +407,10 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 </style>
 
 <style>

src/xt_pages/supply/goodreturn.vue

@@ -326,6 +326,7 @@ export default {
        this.$router.push({path:"/good/return/edit?id="+id})
      },
      toClickOne(val,index){
+       console.log("val323232323232",val)
        if(val.is_check == 1){
          this.$message.error("已审核单据，不能删除!")
          return false
@@ -392,6 +393,10 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 </style>
 
 <style>

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -105,7 +105,7 @@
           <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>
+                 <td style="border:none;">{{item.good_number}}</td>
               </tr>
 
             </div>
@@ -438,6 +438,10 @@ tr:last-child {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 </style>
 
 <style>

src/xt_pages/supply/supplyQuery.vue

@@ -278,6 +278,10 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 .information {
   border: 1px #dcdfe6 solid;
   padding: 30px 20px 30px 20px;