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

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -1,238 +1,317 @@
 <template>
   <div class="prescriptionTable">
-    <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
-              :row-style="{ color: '#303133' }"
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column fixed align="center" type="index" width="40" label="序号"></el-table-column>
-      <el-table-column fixed align="center" prop="name" label="名称">
-        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="name" width="90" label="单次用量">
+    <el-table
+      v-if="prescription.type == 1"
+      :data="prescription.advices"
+      border
+      style="width: 99%"
+      :row-style="changColor"
+      :row-class-name="tableRowClassName"
+      :header-cell-style="{
+        color: '#606266',
+      }"
+      highlight-current-row
+    >
+      <el-table-column
+        fixed
+        align="center"
+        type="index"
+        width="40"
+        label="序号"
+      ></el-table-column>
+      <el-table-column fixed align="center" prop="name" width="200" label="名称">
+        <template slot-scope="scope"
+          ><span :title="scope.row.drug_name">{{
+            scope.row.drug_name
+          }}</span></template
+        >
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="70" label="单次用量">
         <template slot-scope="scope">
-            <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
-            <div>{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</div>
+          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+          <div>
+            {{ scope.row.single_dose }}&nbsp;&nbsp;{{
+              scope.row.single_dose_unit
+            }}
+          </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="用法">
+      <el-table-column align="center" prop="name" width="80" label="用法">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
-          <div> {{scope.row.delivery_way}}</div>
-
+          <div>{{ scope.row.delivery_way }}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="频率">
+      <el-table-column align="center" prop="name" width="80" label="频率">
         <template slot-scope="scope">
-          <div> {{scope.row.execution_frequency}}</div>
+          <div>{{ scope.row.execution_frequency }}</div>
 
           <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="day" width="50" label="天数">
-        <template slot-scope="scope">{{scope.row.day}}天</template>
+      <el-table-column align="center" prop="day" width="80" label="天数">
+        <template slot-scope="scope">{{ scope.row.day }}天</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="100" label="总量">
+      <el-table-column align="center" prop="name" width="80" label="总量">
         <template slot-scope="scope">
-            <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
-            <div>{{scope.row.prescribing_number}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</div>
+          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
+          <div>
+            {{ scope.row.prescribing_number }}&nbsp;&nbsp;{{
+              scope.row.prescribing_number_unit
+            }}
+          </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="60" label="单价">
+      <el-table-column align="center" prop="name" width="80" label="单价">
         <template slot-scope="scope">
-          <div> {{scope.row.retail_price}}元</div>
+          <div>{{ scope.row.retail_price }}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="执行状态">
+      <el-table-column align="center" prop="name" width="80" label="执行状态">
         <template slot-scope="scope">
-          <div> {{scope.row.execution_state == 1 ? '已执行':'未执行'}}</div>
+          <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="120" label="医保编码">
+      <el-table-column align="center" prop="name" width="320" label="医保编码">
         <template slot-scope="scope">
-          <div> {{scope.row.code}}</div>
+          <div>{{ scope.row.code }}</div>
         </template>
       </el-table-column>
 
-
       <el-table-column align="center" prop="name" width="80" label="规格/型号">
         <template slot-scope="scope">
-          <div> {{scope.row.spec}}</div>
+          <div>{{ scope.row.spec }}</div>
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="60" label="金额">
         <template slot-scope="scope">
-          <div> {{scope.row.det_item_fee_sumamt}}</div>
+          <div>{{ scope.row.det_item_fee_sumamt }}</div>
         </template>
       </el-table-column>
 
-
       <el-table-column align="center" prop="name" width="120" label="生产厂家">
         <template slot-scope="scope">
-          <div> {{getName(scope.row.name_id)}}</div>
+          <div>{{ getName(scope.row.name_id) }}</div>
         </template>
       </el-table-column>
 
-
-
       <el-table-column align="center" prop="name" width="90" label="全自费金额">
         <template slot-scope="scope">
-          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
         </template>
       </el-table-column>
 
-
-
       <el-table-column align="center" prop="name" width="90" label="超限价金额">
         <template slot-scope="scope">
-          <div> {{scope.row.overlmt_amt}}元</div>
+          <div>{{ scope.row.overlmt_amt }}元</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="90" label="先行自付金额">
+      <el-table-column
+        align="center"
+        prop="name"
+        width="90"
+        label="先行自付金额"
+      >
         <template slot-scope="scope">
-          <div> {{scope.row.preselfpay_amt}}元</div>
+          <div>{{ scope.row.preselfpay_amt }}元</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="90" label="符合正常范围金额">
+      <el-table-column
+        align="center"
+        prop="name"
+        width="90"
+        label="符合正常范围金额"
+      >
         <template slot-scope="scope">
-          <div> {{scope.row.inscp_scp_amt}}元</div>
+          <div>{{ scope.row.inscp_scp_amt }}元</div>
         </template>
       </el-table-column>
 
-
-
-
-
-
-
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
-          <div> {{scope.row.remark}}</div>
+          <div>{{ scope.row.remark }}</div>
         </template>
       </el-table-column>
     </el-table>
-    <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
-              :row-style="{ color: '#303133' }"
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column fixed align="center" type="index" width="40" label="序号"></el-table-column>
+    <el-table
+      v-if="prescription.type == 2"
+      :data="prescription.project"
+      border
+      style="width: 99%"
+      :row-style="{ color: '#303133' }"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266',
+      }"
+      highlight-current-row
+    >
+      <el-table-column
+        fixed
+        align="center"
+        type="index"
+        width="40"
+        label="序号"
+      ></el-table-column>
       <el-table-column fixed align="center" prop="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
-      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
-
-      </el-table-column>
-      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
-        <template slot-scope="scope">{{scope.row.delivery_way}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
-        <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="number_days" width="50" label="天数">
-        <template slot-scope="scope">{{scope.row.number_days}}天</template>
-
+      <el-table-column
+        align="center"
+        prop="statistical_classification"
+        width="100"
+        label="组"
+      >
+        <template slot-scope="scope">{{
+          scope.row.type == 2
+            ? getGroup(scope.row.statistical_classification)
+            : "耗材"
+        }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="single_dose"
+        width="80"
+        label="单次用量"
+      >
+        <template slot-scope="scope"
+          >{{ scope.row.single_dose }}{{ scope.row.unit }}</template
+        >
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="delivery_way"
+        width="80"
+        label="用法"
+      >
+        <template slot-scope="scope">{{ scope.row.delivery_way }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="execution_frequency"
+        width="80"
+        label="频率"
+      >
+        <template slot-scope="scope">{{
+          scope.row.execution_frequency
+        }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="number_days"
+        width="50"
+        label="天数"
+      >
+        <template slot-scope="scope">{{ scope.row.number_days }}天</template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
-          <div>{{scope.row.total}} {{scope.row.unit}}</div>
+          <div>{{ scope.row.total }} {{ scope.row.unit }}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
-        <template slot-scope="scope">{{scope.row.price}}元</template>
+        <template slot-scope="scope">{{ scope.row.price }}元</template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="60" label="执行状态">
         <template slot-scope="scope">
-          <div> {{scope.row.execution_state == 1 ? '已执行':'未执行'}}</div>
+          <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
       </el-table-column>
 
-
       <el-table-column align="center" prop="name" width="120" label="医保编码">
         <template slot-scope="scope">
-          <div> {{scope.row.medical_code}}</div>
+          <div>{{ scope.row.medical_code }}</div>
         </template>
       </el-table-column>
 
-
       <el-table-column align="center" prop="name" width="80" label="规格/型号">
         <template slot-scope="scope">
-          <div> {{scope.row.spec}}</div>
+          <div>{{ scope.row.spec }}</div>
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="60" label="金额">
         <template slot-scope="scope">
-          <div> {{scope.row.det_item_fee_sumamt}}元</div>
+          <div>{{ scope.row.det_item_fee_sumamt }}元</div>
         </template>
       </el-table-column>
 
-
       <el-table-column align="center" prop="name" width="120" label="生产厂家">
         <template slot-scope="scope">
-          <div> {{getName(scope.row.name_id)}}</div>
+          <div>{{ getName(scope.row.name_id) }}</div>
         </template>
       </el-table-column>
 
-
-
       <el-table-column align="center" prop="name" width="90" label="全自费金额">
         <template slot-scope="scope">
-          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
         </template>
       </el-table-column>
 
-
-
       <el-table-column align="center" prop="name" width="90" label="超限价金额">
         <template slot-scope="scope">
-          <div> {{scope.row.overlmt_amt}}元</div>
+          <div>{{ scope.row.overlmt_amt }}元</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="90" label="先行自付金额">
+      <el-table-column
+        align="center"
+        prop="name"
+        width="90"
+        label="先行自付金额"
+      >
         <template slot-scope="scope">
-          <div> {{scope.row.preselfpay_amt}}元</div>
+          <div>{{ scope.row.preselfpay_amt }}元</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="90" label="符合正常范围金额">
+      <el-table-column
+        align="center"
+        prop="name"
+        width="90"
+        label="符合正常范围金额"
+      >
         <template slot-scope="scope">
-          <div> {{scope.row.inscp_scp_amt}}元</div>
+          <div>{{ scope.row.inscp_scp_amt }}元</div>
         </template>
       </el-table-column>
 
-
-
-
       <el-table-column align="center" prop="name" width="50" label="备注">
-        <template slot-scope="scope">{{scope.row.remark}}</template>
+        <template slot-scope="scope">{{ scope.row.remark }}</template>
       </el-table-column>
     </el-table>
 
     <div class="additionalBox">
-      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
-        <span :title="item.item_name">{{item.item_name}}</span>
-        <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+      <div
+        class="additionalOne"
+        v-for="(item, index) in prescription.addition"
+        :key="index"
+      >
+        <span :title="item.item_name">{{ item.item_name }}</span>
+        <el-input
+          v-model="item.price"
+          placeholder=""
+          style="width: 50px"
+          readonly
+        ></el-input>
         共
-        <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+        <el-input
+          v-model="item.count"
+          placeholder=""
+          style="width: 50px"
+          readonly
+        ></el-input>
         次
         <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
       </div>
@@ -241,89 +320,104 @@
 </template>
 
 <script>
-  import { getInitData } from '@/api/his/his'
-  import { getDictionaryDataConfig} from "@/utils/data";
-
-  export default {
-    props: {
-      prescription: Object,
-      manufacturers:Array,
+import { getInitData } from "@/api/his/his";
+import { getDictionaryDataConfig } from "@/utils/data";
+
+export default {
+  props: {
+    prescription: Object,
+    manufacturers: Array,
+  },
+  data() {
+    return {
+      drugways: [],
+      efs: [],
+    };
+  },
+  mounted() {
+    // getInitData().then(response => {
+    //   if (response.data.state == 0) {
+    //     this.$message.error(response.data.msg)
+    //     return false
+    //   } else {
+    //     this.drugways = response.data.data.drugways
+    //     this.efs = response.data.data.efs
+    //   }
+    // })
+  },
+  methods: {
+    changColor({ row, rowIndex }) {
+     if (rowIndex % 2 == 1) { // 变颜色的条件
+		return {
+		backgroundColor: "#ACD6FF"  // 这个return的就是样式 可以是color 也可以是backgroundColor
+		}
+	}else{
+    return {
+      backgroundColor:"#FFF8D7"
+    }
+  }
     },
-    data() {
-      return {
-        drugways: [],
-        efs: [],
-      }
-    }, mounted() {
-      // getInitData().then(response => {
-      //   if (response.data.state == 0) {
-      //     this.$message.error(response.data.msg)
-      //     return false
-      //   } else {
-      //     this.drugways = response.data.data.drugways
-      //     this.efs = response.data.data.efs
-      //   }
-      // })
-    }, methods:  {
 
-      getName(id){
-        let  name = ""
-        for(let i = 0; i  < this.manufacturers.length; i++){
-          if(id == this.manufacturers[i].id){
-            name =  this.manufacturers[i].manufacturer_name
-          }
+    getName(id) {
+      let name = "";
+      for (let i = 0; i < this.manufacturers.length; i++) {
+        if (id == this.manufacturers[i].id) {
+          name = this.manufacturers[i].manufacturer_name;
         }
-        return name
-
-      },
-      getGroup(id){
-        var name = ""
-        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
-        console.log("2235",statistics_category)
-        for(let i=0;i<statistics_category.length;i++){
-          if(id == statistics_category[i].id){
-            name = statistics_category[i].name
-          }
+      }
+      return name;
+    },
+    getGroup(id) {
+      var name = "";
+      var statistics_category = getDictionaryDataConfig(
+        "system",
+        "statistics_category"
+      );
+      console.log("2235", statistics_category);
+      for (let i = 0; i < statistics_category.length; i++) {
+        if (id == statistics_category[i].id) {
+          name = statistics_category[i].name;
         }
-        return name
-      },
-
-
-    }
-  }
+      }
+      return name;
+    },
+  },
+};
 </script>
 
+
 <style lang="scss">
-.prescriptionTable{
-    .additionalBox{
-      margin-top: 20px;
+.prescriptionTable {
+  .additionalBox {
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+    .additionalOne {
+      margin-right: 20px;
+      margin-bottom: 10px;
       display: flex;
-      flex-wrap: wrap;
-      .additionalOne{
-        margin-right:20px;
-        margin-bottom:10px;
-        display: flex;
-        align-items: center;
-        >span{
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          width:80px;
-          display: inline-block;
-          font-size: 14px;
-        }
+      align-items: center;
+      > span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        width: 80px;
+        display: inline-block;
+        font-size: 14px;
       }
-      .deleteIcon{
-        color:red;
-        margin-left:5px;
-      }
-    }
-    .el-table th .cell, .el-table td .cell{
-        padding: 0 2px;
-        white-space: pre-line;
     }
-    .el-icon-delete{
-        color:red;
+    .deleteIcon {
+      color: red;
+      margin-left: 5px;
     }
+  }
+  .el-table th .cell,
+  .el-table td .cell {
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+  .el-icon-delete {
+    color: red;
+  }
 }
 </style>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -147,8 +147,9 @@
 
         </div>
         <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
-            <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id != 10278" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
-            <img style="width:100%;height:80px" v-else src="https://kuyi.shengws.com/beierlog.png" alt="">
+            <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
+            <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
+           
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span>

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -3,8 +3,8 @@
   <div id='prescriptionPrint1'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' v-if="item.project.length == 0" v-for='(i,pageIndex) in item.pageArr.length' :key="pageIndex" class="prescription-print" style="page-break-after: always;">
-          <span v-if="org_id == 10138"> <img src="https://kuyi.shengws.com/bailin/bltotle.jpg" style="width:100%" alt=""></span>
-          <span v-if="org_id == 10278"> <img src="https://kuyi.shengws.com/beierlog.png" style="width:100%" alt=""></span>
+          <span v-if="org_id == 10138"> <img src="https://kuyi.shengws.com/bailin/bltotle.jpg" style="width:100%" alt=""></span> 
+          <span v-if="org_id == 10278"> <img src="https://kuyi.shengws.com/beierlog.png" style="width:100%" alt=""></span> 
           <div class="printTitle">
             处方笺
             <span v-if="item.med_type == '1111'" style="margin-left: 50px;border: 1px solid #000;">精一</span>
@@ -71,7 +71,7 @@
           </div>
           <div>*处方当日有效，特殊情况可适当延长，一般不超过3天</div>
           <div>*药品属于特殊商品，非质量问题不允许退换</div>
-          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
+          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span> 
           <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span>
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -92,8 +92,8 @@
           <div style="display:flex;">
             打印时间：<span style="border-bottom:1px solid #000;">{{getTime(new Date())?getTime(new Date()):""}}</span>
           </div>
-          <span v-if="org_id == 10138"></span> <img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt="">
-          <span v-if="org_id == 10278"></span> <img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt="">
+          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span> 
+          <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailinbeier.png" style="width:100%" alt=""></span> 
           <div style="page-break-after:always"></div>
      </div>
 

src/xt_pages/supply/components/addGoodReturn.vue

@@ -202,6 +202,7 @@
                 :rules="tableRules.supply_count"
               >
                 <el-input
+                  @input="getSupplyCount(scope.row.supply_count,scope.row.sum_count,scope.row.supply_unit,scope.row.type,scope.row.min_number,scope.row.max_unit,scope.row.min_unit,scope.$index)"
                   v-model="scope.row.supply_count"
                   style="width: 80px"
                   :disabled="disabled"
@@ -554,6 +555,12 @@ export default {
               drugList[i].unitList[0].name = drugList[i].max_unit;
               drugList[i].unitList[1].name = drugList[i].min_unit;
             }
+            drugList[i].sum_count =  this.getWarehoseInfoTwo(
+              drugList[i].drug_warehouse_info,
+              drugList[i].max_unit,
+              drugList[i].min_unit,
+              drugList[i].min_number
+            );
             this.tabList.push(drugList[i]);
           }
           this.drugList = drugList;
@@ -601,6 +608,10 @@ export default {
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
+        
+            goodList[i].sum_count = this.getTotalStockCountTwo(
+              goodList[i].good_warehouse_info
+            );
             this.tabList.push(goodList[i]);
           }
           this.goodList = goodList;
@@ -611,6 +622,7 @@ export default {
       this.currentIndex = val;
     },
     changeName(val) {
+      console.log("val332322323233",val)
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
         if (this.currentIndex == i) {
           this.recordInfo.tableList[i].project_id = val.id;
@@ -643,6 +655,16 @@ export default {
           this.recordInfo.tableList[i].supply_unit = val.supply_unit;
           this.recordInfo.tableList[i].unitList = val.unitList;
           this.recordInfo.tableList[i].count = val.count
+          this.recordInfo.tableList[i].sum_count = val.sum_count
+          if(val.type == 1){
+            this.recordInfo.tableList[i].min_number = val.min_number
+            this.recordInfo.tableList[i].max_unit = val.max_unit
+            this.recordInfo.tableList[i].min_unit = val.min_unit
+          }else{
+             this.recordInfo.tableList[i].max_unit = ""
+             this.recordInfo.tableList[i].min_unit = ""
+             this.recordInfo.tableList[i].min_number = ""
+          }
         }
       }
     },
@@ -674,6 +696,10 @@ export default {
       tempObj["good_number"] = ""
       tempObj["min_price"] = "";
       tempObj["deposit_rate"] = ""
+      tempObj["sum_count"] = 0
+      tempObj["min_number"] = 0
+      tempObj["max_unit"] = ""
+      tempObj["min_unit"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -712,6 +738,15 @@ export default {
       console.log("hh2332232332",max_str + min_str)
       return max_str + min_str;
     },
+    getWarehoseInfoTwo(arr, max_unit, min_unit, min_number){
+      var total = 0;
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
+      }
+      return total
+    },
     getTotalStockCount(arr) {
       var total_count = 0;
       for (let i = 0; i < arr.length; i++) {
@@ -723,6 +758,14 @@ export default {
         return ""
       }
       
+    },
+    getTotalStockCountTwo(arr) {
+      var total_count = 0;
+      for (let i = 0; i < arr.length; i++) {
+        total_count += arr[i].stock_count;
+      }
+      return total_count
+    
     },
     calculate: function (val) {
       if (isNaN(val)) {
@@ -833,7 +876,7 @@ export default {
             }
             orderInfo[i].id = orderInfo[i].id;
             orderInfo[i].supply_count = orderInfo[i].supply_count;
-            orderInfo[i].count = orderInfo[i].count
+            
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
@@ -864,8 +907,20 @@ export default {
                     orderInfo[i].unitList = [{ id: 1, name: "" }];
                     orderInfo[i].unitList[0].name = drugList[j].max_unit;
                   }
+                   //用来统计数量比大小
+                 if(orderInfo[i].supply_unit == drugList[j].max_unit){
+                    orderInfo[i].sum_count = orderInfo[i].count*drugList[j].min_number
+                  }
+                  if(orderInfo[i].supply_unit == drugList[j].min_unit){
+                     orderInfo[i].sum_count = orderInfo[i].count
+                  }
+                  orderInfo[i].min_number =  drugList[j].min_number
+                  orderInfo[i].max_unit =drugList[j].max_unit
+                  orderInfo[i].min_unit =drugList[j].min_unit
                 }
+               
               }
+              orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
             }
             if (orderInfo[i].is_source == 2) {
               for (let j = 0; j < goodList.length; j++) {
@@ -874,10 +929,16 @@ export default {
                   orderInfo[i].unitList[0].name = goodList[j].packing_unit;
                 }
               }
+              orderInfo[i].sum_count = orderInfo[i].count
+              orderInfo[i].min_number = 0
+              orderInfo[i].count = orderInfo[i].count;
+              orderInfo[i].max_unit =""
+              orderInfo[i].min_unit =""
             }
           }
 
           this.recordInfo.tableList = [];
+          console.log("相亲233232322332323223322323",orderInfo)
           this.recordInfo.tableList = orderInfo;
           this.tableDataList = []
           this.tableDataList = orderInfo
@@ -894,6 +955,11 @@ export default {
         if(valid){
           this.loading = true
           for(let i=0;i<this.recordInfo.tableList.length;i++){
+            if(this.recordInfo.tableList[i].count == ""){
+              this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
+              this.loading = false
+              return false
+            }
             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();
@@ -916,7 +982,7 @@ export default {
             }
           } 
            //判断是否在采购单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
-           if(this.recordInfo.tableList.length != this.tableDataList.length){
+           if(this.recordInfo.tableList.length < this.tableDataList.length){
              warehouse_out_id = 0
              for(let i=0;i<this.recordInfo.tableList.length;i++){
                 this.recordInfo.tableList[i].id = 0
@@ -1102,7 +1168,53 @@ export default {
         }
       });
     },
-   
+    getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
+     console.log("val23322323",supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit)
+      var total_count = 0
+      
+      if(type == 1){
+       if(supply_unit == max_unit){
+          total_count = supply_count * min_number
+       }
+       if(supply_unit == min_unit){
+         total_count = supply_count
+       }
+       console.log("sum_counts",sum_count)
+       console.log("count232232332",total_count)
+       if(total_count > sum_count){
+         this.$message.error("数量不能大于可退数量!")
+         for(let i=0;i<this.recordInfo.tableList.length;i++){
+           if(index == i){
+             this.recordInfo.tableList[i].supply_count = ""
+           }
+         }
+       }else{
+           for(let i=0;i<this.recordInfo.tableList.length;i++){
+            if(index == i){
+              this.recordInfo.tableList[i].supply_count = supply_count
+            }
+          }
+         }
+      }
+       
+      if(type == 2){
+         if(supply_count > sum_count){
+          this.$message.error("数量不能大于可退数量!")
+          for(let i=0;i<this.recordInfo.tableList.length;i++){
+            if(index == i){
+              this.recordInfo.tableList[i].supply_count = ""
+            }
+          }
+         }else{
+           for(let i=0;i<this.recordInfo.tableList.length;i++){
+            if(index == i){
+              this.recordInfo.tableList[i].supply_count = supply_count
+            }
+          }
+         }
+      }
+    
+    },
   },
   created() {
     const tempObj = {};
@@ -1132,6 +1244,10 @@ export default {
     tempObj["good_number"] = ""
     tempObj["min_price"] = "";
     tempObj["deposit_rate"] = ""
+    tempObj["sum_count"] = 0
+    tempObj["min_number"] = 0
+    tempObj["max_unit"] = ""
+    tempObj["min_unit"] = ""
     this.recordInfo.tableList.push(tempObj);
    
     this.getInitOrder();

src/xt_pages/supply/components/editGoodReturn.vue

@@ -174,12 +174,12 @@
                   placeholder="请选择"
                   :disabled="disabled"
                 >
-                  <!-- <el-option
-                            v-for="(item,index) in scope.row.unitList"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.name">
-                        </el-option> -->
+                  <el-option
+                    v-for="(item,index) in scope.row.unitList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name">
+                  </el-option>
                 </el-select>
               </el-form-item>
             </template>
@@ -214,6 +214,7 @@
                 :rules="tableRules.supply_count"
               >
                 <el-input
+                 @input="getSupplyCount(scope.row.supply_count,scope.row.sum_count,scope.row.supply_unit,scope.row.type,scope.row.min_number,scope.row.max_unit,scope.row.min_unit,scope.$index)"
                   v-model="scope.row.supply_count"
                   style="width: 80px"
                   :disabled="disabled"
@@ -554,6 +555,7 @@ export default {
               drugList[i].min_unit,
               drugList[i].min_number
             );
+            
             drugList[i].supply_count = "";
             drugList[i].supply_total_price = "";
             drugList[i].supply_manufacturer = drugList[i].manufacturer;
@@ -562,7 +564,6 @@ export default {
             drugList[i].type = 1;
             drugList[i].supply_price = drugList[i].last_price;
             drugList[i].name = drugList[i].drug_name;
-            drugList[i].count = ""
             drugList[i].unitList = [
               { id: 1, name: "" },
               { id: 2, name: "" },
@@ -572,6 +573,12 @@ export default {
               drugList[i].unitList[0].name = drugList[i].max_unit;
               drugList[i].unitList[1].name = drugList[i].min_unit;
             }
+            drugList[i].sum_count =  this.getWarehoseInfoTwo(
+              drugList[i].drug_warehouse_info,
+              drugList[i].max_unit,
+              drugList[i].min_unit,
+              drugList[i].min_number
+            );
             this.tabList.push(drugList[i]);
           }
           this.drugList = drugList;
@@ -617,10 +624,13 @@ export default {
             ];
 
             goodList[i].supply_unit = goodList[i].packing_unit;
-            goodList[i].count = ""
+
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
+            goodList[i].sum_count = this.getTotalStockCountTwo(
+              goodList[i].good_warehouse_info
+            );
             this.tabList.push(goodList[i]);
           }
           this.goodList = goodList;
@@ -631,6 +641,7 @@ export default {
       this.currentIndex = val;
     },
     changeName(val) {
+    
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
         if (this.currentIndex == i) {
           this.recordInfo.tableList[i].project_id = val.id;
@@ -638,8 +649,7 @@ 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;
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
@@ -663,6 +673,19 @@ export default {
           this.recordInfo.tableList[i].supply_unit = val.supply_unit;
           this.recordInfo.tableList[i].unitList = val.unitList;
           this.recordInfo.tableList[i].count = val.count
+          this.recordInfo.tableList[i].sum_count = val.sum_count
+          
+          if(val.type == 1){
+            this.recordInfo.tableList[i].min_number = val.min_number
+            this.recordInfo.tableList[i].max_unit = val.max_unit
+            this.recordInfo.tableList[i].min_unit = val.min_unit
+          }else{
+             this.recordInfo.tableList[i].max_unit = ""
+             this.recordInfo.tableList[i].min_unit = ""
+             this.recordInfo.tableList[i].min_number = ""
+          }
+          
+         
         }
       }
     },
@@ -698,6 +721,10 @@ export default {
       tempObj["good_number"] = ""
       tempObj["deposit_rate"] = ""
       tempObj["order_number"] = ""
+      tempObj["sum_count"] =0
+      tempObj["min_number"] = 0
+      tempObj["max_unit"] = ""
+      tempObj["min_unit"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -744,6 +771,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);
         }
       }
@@ -764,6 +792,15 @@ export default {
       }
       return max_str + min_str;
     },
+    getWarehoseInfoTwo(arr, max_unit, min_unit, min_number){
+      var total = 0;
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
+      }
+      return total
+    },
     getTotalStockCount(arr) {
       var total_count = 0;
       for (let i = 0; i < arr.length; i++) {
@@ -775,6 +812,14 @@ export default {
         return ""
       }
     
+    },
+    getTotalStockCountTwo(arr) {
+      var total_count = 0;
+      for (let i = 0; i < arr.length; i++) {
+        total_count += arr[i].stock_count;
+      }
+      return total_count
+    
     },
     calculate: function (val) {
       if (isNaN(val)) {
@@ -893,6 +938,53 @@ export default {
     count_arrearage() {
       this.payment = this.total_price - this.arrearage;
     },
+    getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
+     console.log("val23322323",supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit)
+      var total_count = 0
+      
+      if(type == 1){
+       if(supply_unit == max_unit){
+          total_count = supply_count * min_number
+       }
+       if(supply_unit == min_unit){
+         total_count = supply_count
+       }
+       console.log("sum_counts",sum_count)
+       console.log("count232232332",total_count)
+       if(total_count > sum_count){
+         this.$message.error("数量不能大于可退数量!")
+         for(let i=0;i<this.recordInfo.tableList.length;i++){
+           if(index == i){
+             this.recordInfo.tableList[i].supply_count = ""
+           }
+         }
+       }else{
+           for(let i=0;i<this.recordInfo.tableList.length;i++){
+            if(index == i){
+              this.recordInfo.tableList[i].supply_count = supply_count
+            }
+          }
+         }
+      }
+       
+      if(type == 2){
+         if(supply_count > sum_count){
+          this.$message.error("数量不能大于可退数量!")
+          for(let i=0;i<this.recordInfo.tableList.length;i++){
+            if(index == i){
+              this.recordInfo.tableList[i].supply_count = ""
+            }
+          }
+         }else{
+           for(let i=0;i<this.recordInfo.tableList.length;i++){
+            if(index == i){
+              this.recordInfo.tableList[i].supply_count = supply_count
+            }
+          }
+         }
+      }
+    
+    },
     getGoodReturnDetail() {
       var id = this.$route.query.id;
       getGoodReturnDetail(id).then((response) => {
@@ -921,7 +1013,6 @@ export default {
           for (let i = 0; i < orderInfo.length; i++) {
             orderInfo[i].id = orderInfo[i].id;
             orderInfo[i].supply_count = orderInfo[i].supply_count;
-            orderInfo[i].count = orderInfo[i].count;
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
@@ -937,11 +1028,9 @@ export default {
             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 = [{ id: 1, name: "" },{ id: 2, name: "" }];
                     orderInfo[i].unitList[0].name = drugList[j].max_unit;
                     orderInfo[i].unitList[1].name = drugList[j].min_unit;
                   }
@@ -949,8 +1038,19 @@ export default {
                     orderInfo[i].unitList = [{ id: 1, name: "" }];
                     orderInfo[i].unitList[0].name = drugList[j].max_unit;
                   }
+                  //用来统计数量比大小
+                  if(orderInfo[i].supply_unit == drugList[j].max_unit){
+                    orderInfo[i].sum_count = orderInfo[i].count*drugList[j].min_number
+                  }
+                  if(orderInfo[i].supply_unit == drugList[j].min_unit){
+                     orderInfo[i].sum_count = orderInfo[i].count
+                  }
+                  orderInfo[i].min_number =  drugList[j].min_number
+                  orderInfo[i].max_unit =drugList[j].max_unit
+                  orderInfo[i].min_unit =drugList[j].min_unit
                 }
               }
+              orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
             }
             if (orderInfo[i].is_source == 2) {
               for (let j = 0; j < goodList.length; j++) {
@@ -959,10 +1059,16 @@ export default {
                   orderInfo[i].unitList[0].name = goodList[j].packing_unit;
                 }
               }
+              orderInfo[i].sum_count = orderInfo[i].count
+              orderInfo[i].min_number = 0
+              orderInfo[i].count = orderInfo[i].count;
+              orderInfo[i].max_unit =""
+              orderInfo[i].min_unit =""
             }
           }
 
           this.recordInfo.tableList = [];
+          console.log("or233232332233223233223",orderInfo)
           this.recordInfo.tableList = orderInfo;
         }
       });
@@ -977,6 +1083,11 @@ export default {
         if (valid) {
           this.loading = true;
           for (let i = 0; i < this.recordInfo.tableList.length; i++) {
+            if(this.recordInfo.tableList[i].count == ""){
+              this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
+              this.loading = false
+              return false
+            }
             this.recordInfo.tableList[i].supply_count = parseInt(
               this.recordInfo.tableList[i].supply_count
             );
@@ -1008,7 +1119,7 @@ export default {
             return_marke: this.return_remark,
           };
           console.log("parms32322332",params)
-         
+          
           updateGoodReturn(
             params,
             warehouse_out_id,
@@ -1114,6 +1225,10 @@ export default {
     tempObj["good_number"] = ""
     tempObj["deposit_rate"] = ""
     tempObj["order_number"] = ""
+    tempObj["sum_count"] = 0
+    tempObj["min_number"] = 0
+    tempObj["max_unit"] = ""
+    tempObj["min_unit"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
 

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -128,10 +128,17 @@
             <!-- <span v-if="scope.row.is_warehouse == 1">全部入库</span>
             <span v-if="scope.row.is_warehouse == 2">未入库</span>
             <span v-if="scope.row.is_warehouse == 3">部分入库</span> -->
-            <span v-if="scope.row.orderOut!= undefined && scope.row.orderOut.length == 0">未入库</span> 
+          
             <span v-if="scope.row.orderOut!= undefined && scope.row.orderOut.length > 0">
-            <span v-if="getStatus(scope.row.orderOut) >= getAllCount(scope.row.orderInfo) ">全部入库</span> 
-            <span v-if="getStatus(scope.row.orderOut) < getAllCount(scope.row.orderInfo) ">部分入库</span> 
+              <span >
+                <span v-if="getStatus(scope.row.orderOut) == 0">未入库</span>
+                <span v-if="getStatus(scope.row.orderOut) > 0">
+                  <span v-if="getStatus(scope.row.orderOut) >= getAllCount(scope.row.orderInfo) ">全部入库</span> 
+                  <span v-if="getStatus(scope.row.orderOut) < getAllCount(scope.row.orderInfo) ">部分入库</span>
+                </span>
+              </span> 
+              
+              
             </span> 
           </template>
         </el-table-column>