11月14日 库存扣减更新

src/router/modules/supply.js

@@ -127,6 +127,24 @@ export default {
       hidden: true,
       is_menu: false,
       isChild: true
+    },
+    {
+      path: '/good/return/print',
+      component: () => import('@/xt_pages/supply/components/goodReturnPrint'),
+      name: 'goodReturnPrint',
+      meta: { title: 'goodReturnPrint', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
+    },
+    {
+      path: '/good/order/print',
+      component: () => import('@/xt_pages/supply/components/goodOrderPrint'),
+      name: 'goodOrderPrint',
+      meta: { title: 'goodOrderPrint', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
     }
 
   ]

src/views/layout/Layout.vue

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

src/xt_pages/supply/components/addGoodOrder.vue

@@ -76,6 +76,7 @@
           <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>
+          <el-button size="small" type="primary" @click="toPrint" v-show="showSix" >打印</el-button>
         </div>
       </div>
 
@@ -553,7 +554,8 @@ export default {
       warese_out_id: 0,
       return_remark: "",
       is_warehouse:0,
-      tableDataList:[]
+      tableDataList:[],
+      showSix:false,
     };
   },
    watch: {
@@ -950,8 +952,7 @@ export default {
       });
     },
     toPrint() {
-      var id = this.$route.query.id;
-      this.$router.push({ path: "/purchase/order/print?&id=" + id });
+      this.$router.push({ path: "/good/order/print?&id=" + this.id });
     },
     saveGoodOrder() {
       if (this.supplier_name == 0 || this.supplier_name == "") {
@@ -1014,6 +1015,7 @@ export default {
               this.$message.success("保存成功!");
               this.showOne = false;
               this.showTwo = true;
+              this.showSix = true
               var orderInfo = response.data.data.list;
               var warehouseOut = response.data.data.warehouseOut;
               this.is_check = 2
@@ -1027,6 +1029,7 @@ export default {
               this.supplier_name = warehouseOut.supplier_id;
               this.return_remake = warehouseOut.return_remake;
               this.warehousing_id  = warehouseOut.warehousing_id
+              this.id = warehouseOut.id
               this.start_time = this.getTimes(warehouseOut.document_date);
               for (let i = 0; i < orderInfo.length; i++) {
                 orderInfo[i].supply_count = orderInfo[i].count;

src/xt_pages/supply/components/addGoodReturn.vue

@@ -60,6 +60,13 @@
             v-show="showTwo"
             >保存</el-button
           >
+          <el-button
+            size="small"
+            type="primary"
+            @click="toPrint"
+            v-show="showSix"
+            >打印</el-button
+          >
           <el-button size="small" type="primary" v-if="is_check == 2" @click="checkReturnOrder">审核</el-button>
           <el-button size="small" type="primary" v-if="is_check == 1" @click="modefyReturnOrder">反审核</el-button> 
         </div>
@@ -468,6 +475,7 @@ export default {
       showThree:false,
       tableDataList:[],
       Reviewed:false,
+      showSix:false,
     };
   },
   watch: {
@@ -809,9 +817,7 @@ export default {
     },
     count_discount() {
       this.rate_of_concession = (
-        this.discount_amount /
-        (this.total_price * 0.01)
-      ).toFixed(2);
+        this.discount_amount /(this.total_price * 0.01)).toFixed(2);
     },
       count_payment() {
       let arrearage_1 = (this.total_price - this.discount_amount - this.payment).toFixed(2);
@@ -945,15 +951,18 @@ export default {
         }
       });
     },
-    toPrint() {
-      var id = this.$route.query.id;
-      this.$router.push({ path: "/purchase/order/print?&id=" + id });
-    },
     saveGoodReturn(){
+      this.loading = true
+      if (this.supplier_name == 0 || this.supplier_name == "") {
+            this.$message.error("供应商不能为空!");
+            this.loading = false;
+            return false;
+       }
       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++){
             if(this.recordInfo.tableList[i].count == ""){
               this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
@@ -1004,6 +1013,7 @@ export default {
                 this.loading = false
                 this.showOne = false
                 this.showTwo = true
+                this.showSix = true
                 this.is_check = 2
                 this.$message.success("保存成功!")
                 var warehouseCancel = response.data.data.warehouseCancel
@@ -1011,10 +1021,28 @@ export default {
                 this.id = out.id
                 this.warehouse_out_id = out.warehouse_out_id
                 this.supplier_name = out.supplier_id
-                this.rate_of_concession = out.rate_of_concession
-                this.discount_amount = out.discount_amount
-                this.payment = out.payment
-                this.arrearage = out.arrearage
+                if(out.rate_of_concession == 0){
+                  this.rate_of_concession = ""
+                }else{
+                 this.rate_of_concession = out.rate_of_concession
+                }
+                if(out.discount_amount == 0){
+                  this.discount_amount = ""
+                }else{
+                  this.discount_amount = out.discount_amount
+                }
+                if(this.payment == 0){
+                   this.payment  = ""
+                }else{
+                  this.payment = out.payment
+                }
+               
+                if(out.arrearage == 0){
+                   this.arrearage = ""
+                }else{
+                  this.arrearage = out.arrearage
+                }
+               
                 this.start_time = this.getTimes(out.document_date)
                 var orderInfo = response.data.data.list
                 
@@ -1074,11 +1102,23 @@ export default {
       })
     },
     updateGoodReturn(){
+      this.loading = true
+      if (this.supplier_name == 0 || this.supplier_name == "") {
+            this.$message.error("供应商不能为空!");
+            this.loading = false;
+            return false;
+       }
       var warehouse_out_id = this.id;
       this.$refs["tableForm"].validate((valid)=>{
         if(valid){
-          this.loading = true
+         
+        
           for(let i=0;i<this.recordInfo.tableList.length;i++){
+            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()
@@ -1215,6 +1255,9 @@ export default {
       }
     
     },
+    toPrint() {
+      this.$router.push({ path: "/good/return/print?&id=" + this.id });
+    },
   },
   created() {
     const tempObj = {};

src/xt_pages/supply/components/editGoodOrder.vue

@@ -70,6 +70,12 @@
             @click="MofyGoodOrder"
             >反审核</el-button
           >
+          <el-button
+            size="small"
+            type="primary"
+            @click="toPrint"
+            >打印</el-button
+          >
         </div>
       </div>
 
@@ -950,9 +956,22 @@ export default {
           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;
+          if(out.discount_amount >0){
+           this.discount_amount = out.discount_amount;
+          }else{
+             this.discount_amount= ""
+          }
+          if(out.payment > 0){
+            this.payment = out.payment;
+          }else{
+           this.payment = ""
+          }
+          if(out.arrearage >0){
+            this.arrearage = out.arrearage;
+          }else{
+            this.arrearage = ""
+          }
+          
           this.number = out.number;
           this.good_number = out.good_number;
           this.return_remark = out.return_remake;
@@ -1049,7 +1068,7 @@ export default {
     },
     toPrint() {
       var id = this.$route.query.id;
-      this.$router.push({ path: "/purchase/order/print?&id=" + id });
+      this.$router.push({ path: "/good/order/print?&id=" + id });
     },
     updateGoodOrder() {
       if (this.supplier_name == 0 || this.supplier_name == "") {

src/xt_pages/supply/components/editGoodReturn.vue

@@ -75,6 +75,12 @@
             v-if="is_check == 1"
             >反审核</el-button
           >
+          <el-button
+            size="small"
+            type="primary"
+            @click="toPrint"
+            >打印</el-button
+          >
         </div>
       </div>
 
@@ -792,6 +798,42 @@ export default {
       }
       return max_str + min_str;
     },
+    getWarehoseInfoSix(arr, max_unit, min_unit, min_number,supply_warehouse_detail_info) {
+      console.log("arr2332232323",arr,max_unit,min_unit,supply_warehouse_detail_info)
+      var total = 0;
+      var max_str = "";
+      var min_str = "";
+      var newArr = []
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          if(supply_warehouse_detail_info == arr[i].supply_warehouse_detail_info){
+             newArr.push(arr[i])
+          }
+         
+        }
+      }
+      if(newArr.length >0){
+         for (let i = 0; i < newArr.length; i++) {
+           total += parseInt(newArr[i].stock_max_number+ newArr[i].stock_min_number);
+         }
+      }
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+    },
     getWarehoseInfoTwo(arr, max_unit, min_unit, min_number){
       var total = 0;
       if (arr.length > 0) {
@@ -996,10 +1038,32 @@ export default {
           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;
+          if(out.rate_of_concession >0){
+             this.rate_of_concession = out.rate_of_concession;
+          }else{
+             this.rate_of_concession = ""
+          }
+          
+          if(out.discount_amount > 0){
+           this.discount_amount = out.discount_amount;
+          }else{
+             this.discount_amount= ""
+          }
+
+          if(out.payment>0){
+           this.payment = out.payment;
+          }else{
+            this.payment = ""
+          }
+          
+          if(out.arrearage>0){
+            this.arrearage = out.arrearage;
+          }else{
+             this.arrearage = ""
+          }
+          
+          
+         
           this.return_remark = out.return_remark
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.orderCancelDetail;
@@ -1020,37 +1084,45 @@ export default {
             orderInfo[i].supply_unit = orderInfo[i].supply_unit;
             orderInfo[i].order_number = orderInfo[i].order_number;
             orderInfo[i].good_number = orderInfo[i].good_number;
-            orderInfo[i].supply_total_price = (
-              orderInfo[i].count * orderInfo[i].price
-            ).toFixed(2);
+            orderInfo[i].supply_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) {
-                  
+                  for (let z = 0; z < drugList[j].drug_warehouse_info.length; z++) {
+                    if (drugList[j].max_unit == drugList[j].drug_warehouse_info[z].max_unit) {
+                      drugList[j].drug_warehouse_info[z].stock_max_number = drugList[j].drug_warehouse_info[z].stock_max_number *drugList[j].min_number;
+                    }
+                   }
                   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;
+                      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;
+                      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
-                  }
+                  // 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].sum_count = this.getWarehoseInfoTwo(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number)
+                  orderInfo[i].count = this.getWarehoseInfoSix(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number,orderInfo[i].supply_warehouse_detail_info)
+                  orderInfo[i].supply_total = this.getWarehoseInfoSix(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number,orderInfo[i].supply_warehouse_detail_info)
                 }
+                
               }
-              orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
+             // orderInfo[i].count = orderInfo[i].count 
+
+             
             }
             if (orderInfo[i].is_source == 2) {
               for (let j = 0; j < goodList.length; j++) {
@@ -1061,7 +1133,9 @@ export default {
               }
               orderInfo[i].sum_count = orderInfo[i].count
               orderInfo[i].min_number = 0
-              orderInfo[i].count = orderInfo[i].count;
+              //orderInfo[i].count = orderInfo[i].count;
+              orderInfo[i].count = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
+              orderInfo[i].supply_total = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
               orderInfo[i].max_unit =""
               orderInfo[i].min_unit =""
             }
@@ -1075,7 +1149,7 @@ export default {
     },
     toPrint() {
       var id = this.$route.query.id;
-      this.$router.push({ path: "/purchase/order/print?&id=" + id });
+      this.$router.push({ path: "/good/return/print?&id=" + id });
     },
     updateGoodReturn() {
       var warehouse_out_id = this.$route.query.id;

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -844,8 +844,18 @@ export default {
           this.return_remark = info.return_remake;
           this.id = info.id;
           this.supplier_name = info.supplier_id;
-          this.rate_of_concession = info.rate_of_concession;
-          this.discount_amount = info.discount_amount;
+         
+          if(info.rate_of_concession >0){
+           this.rate_of_concession = info.rate_of_concession;
+          }else{
+             this.rate_of_concession= ""
+          }
+          if(info.discount_amount >0){
+           this.discount_amount = info.discount_amount;
+          }else{
+            this.discount_amount= ""
+          }
+          
           this.start_time = this.getTimes(info.document_date);
           this.end_time = this.getTimes(info.delivery_date);
           var orderInfo = response.data.data.orderInfo;

src/xt_pages/supply/components/purchaseOrderPrint.vue

@@ -26,7 +26,7 @@
               供应商：{{ getSupplyName(supplier_id) }}
             </div>
             <div style="margin-bottom: 1px; font-size: 18px">
-              单据日期：{{ rate_of_concession }}
+              单据日期：{{ getTimes(document_date) }}
             </div>
             <div style="margin-bottom: 1px; font-size: 18px">
               单据编号：{{ number }}
@@ -42,11 +42,8 @@
                   <td style="line-height: 18px" width="80">商品</td>
                   <td style="line-height: 18px" width="80">单位</td>
                   <td style="line-height: 18px" width="80">数量</td>
-                  <td style="line-height: 18px" width="80">购货单价</td>
-                  <td style="line-height: 18px" width="80">折扣率</td>
-                  <td style="line-height: 18px" width="80">折扣额</td>
-                  <td style="line-height: 18px" width="60">购物金额</td>
-                  <td style="line-height: 18px" width="80">仓库</td>
+                  <td style="line-height: 18px" width="80">采购单价</td>
+                  <td style="line-height: 18px" width="60">采购金额</td>
                 </tr>
               </thead>
               <tbody>
@@ -66,21 +63,18 @@
                   <td style="line-height: 18px">
                     <span>{{ item.price }}</span>
                   </td>
-                  <td style="line-height: 18px">
-                    <span>{{ rate_of_concession }}</span>
-                  </td>
-                  <td style="line-height: 18px">
-                    <span>{{ discount_amount }}</span>
-                  </td>
                   <td style="line-height: 18px">
                     <span>{{ (item.count * item.price).toFixed(2) }}</span>
                   </td>
-                  <td style="line-height: 18px"><span></span></td>
                 </tr>
                 <tr>
-                  <td>合计</td>
-                  <td colspan="12" style="text-align: right"></td>
+                  <td colspan="3" style="line-height: 18px">合计</td>
+                  <td colspan="1" style="line-height: 18px">{{getAllCount()}}</td>
+                  <td colspan="2" style="line-height: 18px"></td>
                 </tr>
+                 <tr>
+                  <td colspan="6" style="line-height: 18px">合计  金额大写 {{getAllPrice()}}</td>
+                 </tr>
               </tbody>
             </table>
 
@@ -124,17 +118,7 @@
                 font-size: 18px;
               "
             >
-              供应商：
-            </div>
-            <div
-              style="
-                width: 25%;
-                text-align: left;
-                margin-bottom: 1px;
-                font-size: 18px;
-              "
-            >
-              折扣金额：
+              供应商：{{ getSupplyName(supplier_id) }}
             </div>
             <div
               style="
@@ -144,7 +128,7 @@
                 font-size: 18px;
               "
             >
-              本次付款：
+              优惠率：<span v-if="rate_of_concession>0">{{rate_of_concession}}%</span>
             </div>
             <div
               style="
@@ -154,7 +138,7 @@
                 font-size: 18px;
               "
             >
-              本次欠款：
+              优惠金额：<span v-if="discount_amount>0">{{discount_amount}}</span>
             </div>
             <div
               style="
@@ -164,7 +148,7 @@
                 font-size: 18px;
               "
             >
-              备注：
+              备注：{{return_remake}}
             </div>
             <div
               style="
@@ -174,7 +158,7 @@
                 font-size: 18px;
               "
             >
-              制单人：
+              制单人：{{getXuserName(creater)}}
             </div>
             <div
               style="
@@ -240,6 +224,8 @@ export default {
       discount_amount: "",
       supplyList: [],
       document_date: "",
+      return_remake:"",
+      creater:""
     };
   },
   methods: {
@@ -320,6 +306,8 @@ export default {
           this.document_date = info.document_date;
           var orderInfo = response.data.data.orderInfo;
           var supplyList = response.data.data.supplyList;
+          this.return_remake = info.return_remake
+          this.creater = info.creater
           this.supplyList = supplyList;
           for (let i = 0; i < orderInfo.length; i++) {
             orderInfo[i].supply_count = orderInfo[i].count;
@@ -342,6 +330,65 @@ export default {
       }
       return name;
     },
+    getTimes(time) {
+      if (time === "") {
+        return "";
+      }
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getAllPrice() {
+      var total_price = 0;
+      for (let i = 0; i < this.tableList.length; i++) {
+        total_price +=(this.tableList[i].price *this.tableList[i].count)
+      }
+      this.total_price = total_price;
+      if(total_price > 0){
+         return this.smallToBIG(total_price.toFixed(2));
+      }else{
+        return ""
+      }
+     
+    },
+     smallToBIG(price) {
+        let fraction = ['角', '分'];
+        let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+        let unit = [['元.', '万,', '亿,'], ['', '拾', '佰', '仟']];
+        let head = price < 0 ? '欠' : '';
+        price = Math.abs(price);
+        console.log("price",price)
+        let upper = '';
+        for (let i = 0; i < fraction.length; i++) {
+          upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+        }
+        upper = upper || '整';
+        console.log("price",upper)
+        price = Math.floor(price);
+        for (let i = 0; i < unit[0].length && price > 0; i++) {
+          let p = '';
+          for (let j = 0; j < unit[1].length && price > 0; j++) {
+            p = digit[price % 10] + unit[1][j] + p;
+            price = Math.floor(price / 10);
+          }
+          upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+        }
+       
+        var zhongwen = head + upper.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
+      
+        var ztr = zhongwen.replaceAll(".","");
+    
+        return ztr
+      },
+     getAllCount(){
+      var total = 0
+      for(let i=0;i<this.tableList.length;i++){
+         total +=this.tableList[i].count
+      }  
+      if(total > 0){
+       return total
+      }else{
+        return ""
+      } 
+    },
   },
   created() {
     this.orgName = this.$store.getters.xt_user.org.org_name;

src/xt_pages/supply/goodreturn.vue

@@ -347,7 +347,7 @@ export default {
       var buy_price = 0;
       if (arr != undefined && arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          buy_price += parseInt(arr[i].supply_count) * arr[i].price;
+          buy_price += (parseInt(arr[i].supply_count) * arr[i].price -(parseInt(arr[i].supply_count) * arr[i].price * arr[i].deposit_rate/100));
         }
       }
       return (buy_price - discount_amount).toFixed(2);

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -128,7 +128,7 @@
             <!-- <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 >
                 <span v-if="getStatus(scope.row.orderOut) == 0">未入库</span>
@@ -137,8 +137,6 @@
                   <span v-if="getStatus(scope.row.orderOut) < getAllCount(scope.row.orderInfo) ">部分入库</span>
                 </span>
               </span> 
-              
-              
             </span> 
           </template>
         </el-table-column>

src/xt_pages/user/doctorAdvice.vue

@@ -3450,6 +3450,7 @@ export default {
     },
 
     selectAdvice(selection, row) {
+      console.log("row322232322323",row)
       if (this.adviceType != 3) {
         this.lstableData = [];
       } else if (this.adviceType != 1) {
@@ -3489,6 +3490,7 @@ export default {
       // console.log("val", val);
     },
     printThisInfo() {
+       console.log("hh233233",this.adviceType)
       if (this.adviceType == 1) {
         if (this.cqtableData.length == 0) {
           this.$message.error("请勾选需要打印的医嘱!");
@@ -4345,11 +4347,8 @@ export default {
       getAllAdviceConfig().then(response => {
         if (response.data.state == 1) {
           this.deliveryWayOptions =
-            response.data.data.drugways === null
-              ? []
-              : response.data.data.drugways;
-          this.executionFrequencyOptions =
-            response.data.data.efs === null ? [] : response.data.data.efs;
+            response.data.data.drugways === null? []: response.data.data.drugways;
+          this.executionFrequencyOptions = response.data.data.efs === null ? [] : response.data.data.efs;
         }
       });
     },