11月14日 库存扣减更新

src/router/modules/drugs.js

@@ -30,12 +30,12 @@ export default {
       name: 'drugsStockOut',
       meta: { title: 'drugsStockOut', noCache: true }
     },
-    {
-      path: '/stock/drugs/drugModifyPrice',
-      component: () => import('@/xt_pages/stock/drugs/drugModifyPrice'),
-      name: 'drugModifyPrice',
-      meta: { title: 'drugModifyPrice', noCache: true }
-    },
+    // {
+    //   path: '/stock/drugs/drugModifyPrice',
+    //   component: () => import('@/xt_pages/stock/drugs/drugModifyPrice'),
+    //   name: 'drugModifyPrice',
+    //   meta: { title: 'drugModifyPrice', noCache: true }
+    // },
     {
       path: '/stock/drugs/drugModifyPricePrint',
       component: () => import('@/xt_pages/stock/drugs/drugModifyPricePrint'),
@@ -56,18 +56,18 @@ export default {
       name: 'drugDamaged',
       meta: { title: 'drugDamaged', noCache: true }
     },
-    {
-      path: '/stock/drugs/drugWarning',
-      component: () => import('@/xt_pages/stock/drugs/drugWarning'),
-      name: 'drugWarning',
-      meta: { title: 'drugWarning', noCache: true }
-    },
-    {
-      path: '/stock/drugs/drugInventory',
-      component: () => import('@/xt_pages/stock/drugs/drugInventory'),
-      name: 'drugInventory',
-      meta: { title: 'drugInventory', noCache: true }
-    },
+    // {
+    //   path: '/stock/drugs/drugWarning',
+    //   component: () => import('@/xt_pages/stock/drugs/drugWarning'),
+    //   name: 'drugWarning',
+    //   meta: { title: 'drugWarning', noCache: true }
+    // },
+    // {
+    //   path: '/stock/drugs/drugInventory',
+    //   component: () => import('@/xt_pages/stock/drugs/drugInventory'),
+    //   name: 'drugInventory',
+    //   meta: { title: 'drugInventory', noCache: true }
+    // },
     {
       path: '/stock/drugs/inventoryPrint',
       component: () => import('@/xt_pages/stock/drugs/inventoryPrint'),

src/router/modules/stock.js

@@ -42,12 +42,12 @@ export default {
       name: 'cancelStockOrder',
       meta: { title: 'cancelStockOrder', noCache: true }
     },
-    {
-      path: '/stock/stockModifyPrice',
-      component: () => import('@/xt_pages/stock/stockModifyPrice'),
-      name: 'stockModifyPrice',
-      meta: { title: 'stockModifyPrice', noCache: true }
-    },
+    // {
+    //   path: '/stock/stockModifyPrice',
+    //   component: () => import('@/xt_pages/stock/stockModifyPrice'),
+    //   name: 'stockModifyPrice',
+    //   meta: { title: 'stockModifyPrice', noCache: true }
+    // },
     {
       path: '/stock/stockModifyPricePrint',
       component: () => import('@/xt_pages/stock/stockModifyPricePrint'),
@@ -56,12 +56,12 @@ export default {
       is_menu: false,
       meta: { title: 'stockModifyPricePrint', noCache: true }
     },
-    {
-      path: '/stock/stockDamaged',
-      component: () => import('@/xt_pages/stock/stockDamaged'),
-      name: 'stockDamaged',
-      meta: { title: 'stockDamaged', noCache: true }
-    },
+    // {
+    //   path: '/stock/stockDamaged',
+    //   component: () => import('@/xt_pages/stock/stockDamaged'),
+    //   name: 'stockDamaged',
+    //   meta: { title: 'stockDamaged', noCache: true }
+    // },
     {
       path: '/stock/stockDamagePrint',
       component: () => import('@/xt_pages/stock/stockDamagePrint'),
@@ -70,12 +70,12 @@ export default {
       is_menu: false,
       meta: { title: 'stockModifyPricePrint', noCache: true }
     },
-    {
-      path: '/stock/stockWarning',
-      component: () => import('@/xt_pages/stock/stockWarning'),
-      name: 'stockWarning',
-      meta: { title: 'stockWarning', noCache: true }
-    },
+    // {
+    //   path: '/stock/stockWarning',
+    //   component: () => import('@/xt_pages/stock/stockWarning'),
+    //   name: 'stockWarning',
+    //   meta: { title: 'stockWarning', noCache: true }
+    // },
     {
       path: '/stock/stockInventory',
       component: () => import('@/xt_pages/stock/stockInventory'),

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -115,7 +115,7 @@
                   v-model="scope.row.return_count"
                 ></el-input>      
               </el-form-item>
-              <!-- {{scope.row.packing_unit}} -->
+            
             </template>
           </el-table-column>
           <el-table-column width="150" align="center">
@@ -154,7 +154,7 @@
               >
                <el-select v-model="scope.row.number" filterable placeholder="请选择">
                   <el-option
-                    v-for="(item,index) in numberList"
+                    v-for="(item,index) in scope.row.xt_warehouse_info"
                     :key="index"
                     :label="item.number"
                     :value="item.id">
@@ -439,6 +439,7 @@ export default {
       tempObj["price"] = ""
       tempObj["total"] = ""
       tempObj["warehouse_info_id"] =  0
+      tempObj["xt_warehouse_info"] = []
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -546,27 +547,26 @@ export default {
             this.$message.success("请添加退库商品");
             return;
           }
-          console.log("hhhhh2h332",this.recordInfo.recordData)
+   
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             if(this.recordInfo.recordData[i].good_id == 0){
                this.$message.error("耗材规格不能为空")
                return
             }
-
-            for(let j=0;j<this.numberList.length;j++){
-              if(this.recordInfo.recordData[i].number == this.numberList[j].id){
-                this.recordInfo.recordData[i].number = this.numberList[j].number
-                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[j].id
-              }
-            }
-            
+            for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+               if(this.recordInfo.recordData[i].number == this.recordInfo.recordData[i].xt_warehouse_info[j].id){
+                  this.recordInfo.recordData[i].number = this.recordInfo.recordData[i].xt_warehouse_info[j].number
+                  this.recordInfo.recordData[i].warehouse_info_id = this.recordInfo.recordData[i].xt_warehouse_info[j].id
+               }
+            }     
           }
 
           const params = {
             cancelStock: this.recordInfo.recordData
           };
-          console.log("params",params)
-         
+        
+          console.log("parasm23233222332323",params)
+          
           postCancelStock(
             params,
             this.return_time,
@@ -622,9 +622,8 @@ export default {
       }
     postSearchGoodList(key).then(response => {
         if (response.data.state == 1) {
-          
             var list = response.data.data.list
-            
+           
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
@@ -656,17 +655,16 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-      //获取当前耗材的批号
-      this.getStockBatchNumber(val.id)
+      console.log("列表23323232332",this.recordInfo.recordData)
       for(let i=0;i<this.recordInfo.recordData.length;i++){
         if(this.currentIndex == i){
-          this.recordInfo.recordData[i].good_type_id = val.id
           this.recordInfo.recordData[i].good_name = val.good_name
           this.recordInfo.recordData[i].good_type_id = val.good_type_id
           this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
-          this.recordInfo.recordData[i].number =  val.number
+          this.recordInfo.recordData[i].number =  ""
           this.recordInfo.recordData[i].manufacturer = val.manufacturer
           this.recordInfo.recordData[i].remark = val.remark
+          this.recordInfo.recordData[i].xt_warehouse_info = val.xt_warehouse_info
           if(val.buy_price == 0){
             this.recordInfo.recordData[i].price = ""
           }else{
@@ -693,6 +691,8 @@ export default {
         if(response.data.state == 1){
           var list = response.data.data.list
           console.log("list2243444",list)
+
+          this.numberList = []
           this.numberList = list
         }
      })
@@ -722,6 +722,7 @@ export default {
     tempObj["price"] = ""
     tempObj["total"] = ""
     tempObj["warehouse_info_id"] = 0
+    tempObj["xt_warehouse_info"] = []
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -114,7 +114,7 @@
               >
                <el-select v-model="scope.row.number" filterable placeholder="请选择" >
                   <el-option
-                    v-for="(item,index) in numberList"
+                    v-for="(item,index) in scope.row.xt_warehouse_info"
                     :key="index"
                     :label="item.number"
                     :value="item.id">
@@ -400,6 +400,7 @@
         tempObj["remark"] = ""
         tempObj["price"] = 0
         tempObj["warehouse_info_id"] = 0
+        tempObj["xt_warehouse_info"] = []
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {
@@ -513,18 +514,18 @@
               }
               array[i].price = array[i].price.toString()
             }
-
+            console.log("hh2332322323",this.recordInfo.recordData)
             for(let i=0;i<this.recordInfo.recordData.length;i++){
                if(this.recordInfo.recordData[i].good_id == 0){
                   this.$message.error("耗材规格不能为空")
                   return
                }
-             for(let j=0;j<this.numberList.length;j++){
-                if(this.recordInfo.recordData[i].number == this.numberList[j].id){
-                  this.recordInfo.recordData[i].number = this.numberList[j].number
-                  this.recordInfo.recordData[i].warehouse_info_id = this.numberList[j].id
+              for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+                if(this.recordInfo.recordData[i].number == this.recordInfo.recordData[i].xt_warehouse_info[j].id){
+                    this.recordInfo.recordData[i].number = this.recordInfo.recordData[i].xt_warehouse_info[j].number
+                    this.recordInfo.recordData[i].warehouse_info_id = this.recordInfo.recordData[i].xt_warehouse_info[j].id
                 }
-             }
+              }     
             }
 
             const params = {
@@ -586,6 +587,7 @@
               response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{m}-{d}")
               response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{m}-{d}")
               response.data.data.list[i].return_count = response.data.data.list[i].count
+              response.data.data.list[i].xt_warehouse_info = response.data.data.list[i].xt_warehouse_info
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.cancelStock = response.data.data.info
@@ -655,9 +657,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
-        console.log("val",val)
         //获取当前耗材的批号
-         this.getStockBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].good_type_id = val.id
@@ -667,6 +667,7 @@
               this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
+              this.recordInfo.recordData[i].xt_warehouse_info = val.xt_warehouse_info
               if(val.buy_price == 0){
                this.recordInfo.recordData[i].price = ""
               }else{

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -402,7 +402,7 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+      
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -581,18 +581,20 @@ export default {
       this.getCancelStockDetail(val.id)
     },
     getCancelStockDetail(id){
+      console.log("id232233223",id)
         var params = {
           id:id
         }
       getCancelStockDetail(params).then(response=>{
        if(response.data.state == 1){
          var list =  response.data.data.list
+         console.log("hhhh23233323223",list)
          for(let i=0;i<list.length;i++){
            list[i].product_date = this.getTime(list[i].product_date,"{y}-{h}-{d}")
            list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{h}-{d}")
          }
          this.tableList = list
-         console.log("list23232",list)
+        //  console.log("list23232",list)
          this.showTable = true
        }
       })
@@ -621,7 +623,7 @@ export default {
      getDrugCancelExportList(params).then(response=>{
         if(response.data.state == 1){
          var list = response.data.data.list
-         console.log("导出数据222",list)
+        //  console.log("导出数据222",list)
          this.exportList = list
         }
      })
@@ -632,8 +634,7 @@ export default {
         return
       }
      import('@/vendor/Export2Excel').then(excel => {
-      console.log("23232323",this.exportList)
-      return
+     
       for(let i=0;i<this.exportList.length;i++){
         this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
         this.exportList[i].drug_name = this.exportList[i].BaseDrugLib.drug_name
@@ -650,7 +651,7 @@ export default {
       }
       const tHeader = ['药品名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
       const filterVal = ['drug_name', 'unit','count','price','batch_number','register_account','manufacturer','product_date','expiry_date','remark']
-      console.log("table",this.exportList)
+      // console.log("table",this.exportList)
     
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -172,7 +172,7 @@
               >
                <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
                   <el-option
-                    v-for="(item,index) in numberList"
+                    v-for="(item,index) in scope.row.drug_warehouse_info"
                     :key="index"
                     :label="item.batch_number"
                     :value="item.id">
@@ -463,6 +463,7 @@ export default {
       tempObj["batch_number"] = ""
       tempObj["max_unit"] = ""
       tempObj["batch_number_id"] = 0
+      tempObj["drug_warehouse_info"] = []
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -546,6 +547,7 @@ export default {
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;
+          console.log("列表23323232323232",array)
           let total = 0;
           for (let i = 0; i < array.length; i++) {
 
@@ -562,19 +564,18 @@ export default {
           }
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
-            console.log("批次列表",this.numberList)
-             for(let j=0;j<this.numberList.length;j++){
-                if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
-                   this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number
-                   this.recordInfo.recordData[i].batch_number_id = this.numberList[j].id
-                 
-                }
-             }
+            for(let j=0;j<this.recordInfo.recordData[i].drug_warehouse_info.length;j++){
+               
+               if(this.recordInfo.recordData[i].batch_number == this.recordInfo.recordData[i].drug_warehouse_info[j].id){
+                  this.recordInfo.recordData[i].batch_number = this.recordInfo.recordData[i].drug_warehouse_info[j].batch_number
+                  this.recordInfo.recordData[i].batch_number_id = this.recordInfo.recordData[i].drug_warehouse_info[j].id
+               }
+            }
           }
           const params = {
             cancelStock: this.recordInfo.recordData
           };
-          console.log("params2222",params,this.return_time)
+         console.log("params2222",params,this.return_time)
         
           postDrugCancelStock(
             params,
@@ -658,17 +659,17 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
+        console.log("val345555555555555555555",val)
          var arr = []
          for(let i=0;i<this.recordInfo.recordData.length;i++){
             arr.push(this.recordInfo.recordData[i].drug_id)
          }
          var str = arr.join(",")
-         console.log("str",str)
          if(str.indexOf(val.id)!=-1){
             this.$message.error("该药品已存在列表中")
             return
          }
-         this.getDrugBatchNumber(val.id)
+        //  this.getDrugBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id  = val.id
@@ -678,9 +679,10 @@ export default {
              this.recordInfo.recordData[i].last_price = val.last_price
              this.recordInfo.recordData[i].price = val.last_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
-             this.recordInfo.recordData[i].number =  val.number
+           
              this.recordInfo.recordData[i].max_unit = val.max_unit
              this.recordInfo.recordData[i].min_unit = val.min_unit
+             this.recordInfo.recordData[i].drug_warehouse_info = val.drug_warehouse_info
              if(val.dealer == 0){
                this.recordInfo.recordData[i].dealer = ""
              }else{
@@ -689,7 +691,7 @@ export default {
             
            }
         }
-        console.log("333333",this.recordInfo.recordData)
+        // console.log("333333",this.recordInfo.recordData)
       },
       getDrugBatchNumber(id){
           var params = {
@@ -698,7 +700,7 @@ export default {
         getDrugBatchNumber(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-             console.log("list2222",list)
+            //  console.log("list2222",list)
              for(let i=0;i<list.length;i++){
                this.numberList.push(list[i])
              }
@@ -736,8 +738,9 @@ export default {
     tempObj["batch_number"] = ""
     tempObj["batch_number_id"] = 0
     tempObj["max_unit"] = ""
+    tempObj["drug_warehouse_info"] = []
     this.unitList =  getDataConfig('hemodialysis','units')
-    console.log("单位",this.unitList)
+    // console.log("单位",this.unitList)
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -164,34 +164,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="生产厂家" width="140" align="center">
-            <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
-                <el-option
-                  v-for="(option, index) in manufacturerList"
-                  :key="index"
-                  :label="option.manufacturer_name"
-                  :value="option.id">
-                </el-option>
-               </el-select>
-            </template>
-          </el-table-column>
- 
-
-          <el-table-column label="生产日期" width="180" align="center">
-            <template slot-scope="scope">
-              <el-date-picker
-                prefix-icon="el-icon-date"
-                style="width: 145px"
-                v-model="scope.row.product_date"
-                type="date"
-                placeholder="选择日期时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
-            </template>
-          </el-table-column>
-          <el-table-column  width="180" align="center">
+           <el-table-column  width="180" align="center">
              <template slot="header" slot-scope="scope">
               <span>有效日期<span style="color: red">*</span></span>
             </template>
@@ -212,6 +185,34 @@
             </template>
           </el-table-column>
 
+      
+          <el-table-column label="生产日期" width="180" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+         
+         <el-table-column label="生产厂家" width="140" align="center">
+            <template slot-scope="scope">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+ 
 
       <el-table-column label="经销商" width="140" align="center">
           <template slot-scope="scope">

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -226,17 +226,26 @@
               {{ calculate(scope.row.last_price * scope.row.warehousing_count) }} 
             </template>
           </el-table-column>
-         
-          <el-table-column label="生产厂家" width="140" align="center">
+    
+
+         <el-table-column  width="180" align="center">
+             <template slot="header" slot-scope="scope">
+              <span>有效日期<span style="color: red">*</span></span>
+            </template>
             <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
-                <el-option
-                  v-for="(option, index) in manufacturerList"
-                  :key="index"
-                  :label="option.manufacturer_name"
-                  :value="option.id">
-                </el-option>
-               </el-select>
+              <el-form-item   :prop="'recordData.' + scope.$index + '.expiry_date'"
+                :rules="tableRules.expiry_date"
+                style="padding-top: 20px">
+                <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"
+                ></el-date-picker>
+              </el-form-item>
             </template>
           </el-table-column>
 
@@ -254,20 +263,20 @@
             </template>
           </el-table-column>
 
-
-         <el-table-column label="有效日期" width="180" align="center">
+             
+          <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-              <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"
-              ></el-date-picker>
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
             </template>
           </el-table-column>
+       
 
           <el-table-column label="经销商" width="140" align="center">
             <template slot-scope="scope">
@@ -399,8 +408,10 @@ export default {
         warehousing_count: [
           { required: true, message: "数量不能为空", trigge: "blur" }
         ],
-
-        good_id: [{ validator: checkGoodId, trigger: "blur" }]
+        good_id: [{ validator: checkGoodId, trigger: "blur" }],
+        expiry_date:[
+         {required:true,message:'有效日期不能为空',trigger:'blur'}
+        ],
       },
 
       total: "",

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -709,6 +709,10 @@ export default {
       }
       const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_sys == 1){
+          this.$message.error("自动出库数据不能删除!")
+          return false
+        }
         if(this.selectedTableData[i].is_sys == 0){
           ids.push(this.selectedTableData[i].id);
         }

src/xt_pages/stock/drugs/query.vue

@@ -112,22 +112,26 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+             <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
                 <span>
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
                 </span>
              </span>
-             <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
+             <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span> -->
+              <span>
+                 {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
+              </span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+               <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
                </span>
 
-               <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
+               <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span> -->
+                {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
             </div>
            </template>
         </el-table-column>
@@ -198,7 +202,7 @@ import { min } from 'moment'
       this.drugTypeList.push(...drugTypeList)
       this.org_id =  this.$store.getters.xt_user.org.id
       console.log("机构ID",this.org_id)
-      this.getDrugCountList()
+      // this.getDrugCountList()
 
 
     },
@@ -363,12 +367,10 @@ import { min } from 'moment'
       handleSizeChange(val) {
         this.limit = val
         this.getlist()
-        this.getDrugCountList()
       },
       handleCurrentChange(val) {
         this.page = val
         this.getlist()
-        this.getDrugCountList()
       },
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
@@ -429,7 +431,6 @@ import { min } from 'moment'
       },
       search: function() {
         this.getlist()
-        this.getDrugCountList()
       },
       setting: function() {
         this.$refs.dialog.show()
@@ -441,7 +442,7 @@ import { min } from 'moment'
            this.tableList[i].drug_type_name = this.getDrugType(this.tableList[i].drug_type)
            this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number+this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
            this.tableList[i].manufacturer_name = this.getManufacturerList(this.tableList[i].manufacturer)
-
+        
           this.tableList[i].inCount =  this.getWarehoseInfo(this.tableList[i].drug_warehouse_info)
           this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)

src/xt_pages/stock/stockInOrderAdd.vue

@@ -128,29 +128,6 @@
               {{calculate(scope.row.price*scope.row.warehousing_count)}}
             </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-option
-                  v-for="(option, index) in manufacturerList"
-                  :key="index"
-                  :label="option.manufacturer_name"
-                  :value="option.id">
-                </el-option>
-               </el-select>
-            </template>
-          </el-table-column>
-        
-          <el-table-column label="生产日期" align="center" width="180">
-            <template slot-scope="scope">
-              <el-date-picker prefix-icon="el-icon-date" v-model="scope.row.product_date" style="width: 145px"
-                              type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd">
-              </el-date-picker>
-
-            </template>
-          </el-table-column>
           <el-table-column  align="center" width="180">
             <template slot="header" slot-scope="scope">
               <span>有效日期<span style="color: red">*</span></span>
@@ -165,6 +142,30 @@
              </el-form-item>
             </template>
           </el-table-column>
+        
+        
+          <el-table-column label="生产日期" align="center" width="180">
+            <template slot-scope="scope">
+              <el-date-picker prefix-icon="el-icon-date" v-model="scope.row.product_date" style="width: 145px"
+                              type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd">
+              </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-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
 
          <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">

src/xt_pages/stock/stockInOrderEdit.vue

@@ -212,7 +212,38 @@
               {{ calculate(scope.row.price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
-          <el-table-column label="生产厂家" align="center" width="150">
+
+         <el-table-column  align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <span>有效日期<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item  :prop="'recordData.' + scope.$index + '.expiry_date'"
+                :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">
+                </el-date-picker>
+             </el-form-item>
+            </template>
+          </el-table-column>
+         
+
+          <el-table-column label="生产日期" width="180" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></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-option
@@ -238,33 +269,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-
-          <el-table-column label="生产日期" width="180" align="center">
-            <template slot-scope="scope">
-              <el-date-picker
-                prefix-icon="el-icon-date"
-                style="width: 145px"
-                v-model="scope.row.product_date"
-                type="date"
-                placeholder="选择日期时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
-            </template>
-          </el-table-column>
-          <el-table-column label="有效日期" width="180" align="center">
-            <template slot-scope="scope">
-              <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"
-              ></el-date-picker>
-            </template>
-          </el-table-column>
+        
            <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
               <span>批准文号</span>
@@ -394,7 +399,10 @@ export default {
           { required: true, message: "数量不能为空", trigge: "blur" }
         ],
 
-        good_id: [{ validator: checkGoodId, trigger: "blur" }]
+        good_id: [{ validator: checkGoodId, trigger: "blur" }],
+        expiry_date:[
+         { required: true, message: '有效日期不能为空', trigge: 'blur' }
+        ],
       },
 
       total: "",

src/xt_pages/stock/stockOutOrder.vue

@@ -1012,6 +1012,10 @@ export default {
       }
       const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_sys == 1){
+          this.$message.error("自动出库数据不能删除!")
+          return false
+        }
          if(this.selectedTableData[i].is_sys == 0){
            ids.push(this.selectedTableData[i].id);
          }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -118,24 +118,7 @@
             </template>
           </el-table-column>
           
-          <!-- <el-table-column  width="150" align="center">
-             <template slot="header" slot-scope="scope">
-              <span>批号<span style="color: red">*</span></span>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item  
-                :rules="tableRules.number">
-                <el-select v-model="scope.row.number" filterable placeholder="请选择" @change="changeNumberList(scope.row,scope.$index)">
-                  <el-option
-                    v-for="(item,index) in numberList"
-                    :key="index"
-                    :label="item.number"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column> -->
+      
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -463,7 +446,6 @@ export default {
       tempObj["product_date"] = ""
       tempObj["license_number"] = ""
       tempObj["warehouse_info_id"] = 0
-     
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -784,6 +766,7 @@ export default {
     tempObj["dealer"] = ""
     tempObj["license_number"] = ""
     tempObj["warehouse_info_id"] = 0
+    
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/user/doctorAdvice.vue

@@ -168,7 +168,7 @@
           align="center"
         >
           <template slot-scope="scope">
-            <span v-if="org_id == 10215">{{ scope.row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
+            <span v-if="org_id == 10215">{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
             <span v-else>{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
           </template>
         </el-table-column>
@@ -341,6 +341,17 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          label="医嘱状态"
+          width="180"
+          property="stop_time"
+          align="center"
+        >
+          <template slot-scope="scope">
+             <span v-if="scope.row.stop_state == 1">已停止</span>
+             <span v-if="scope.row.stop_state == 2">未停止</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="终止时间"
           width="180"
@@ -4344,14 +4355,16 @@ export default {
     },
     // 获取勾选中的行
     getPrintInfo(ids) {
-      getPrintInfo({ ids: ids }).then(response => {
+      getPrintInfo({ ids: ids}).then(response => {
         if (response.data.state === 1) {
           var doctoradvice = response.data.data.doctoradvice;
-          // console.log("doctoradvice", doctoradvice);
+          console.log("doctoradvice", doctoradvice);
+         
           this.dataAdvice = doctoradvice;
           if (this.adviceType === 3 || this.adviceType === 2 || this.adviceType == 4) {
+           
             this.lstableData = this.dataAdvice;
-            // console.log("---", this.multipleSelection);
+            
           } else if (this.adviceType === 1) {
             this.cqtableData = doctoradvice;
           }