口服

src/api/pharmacy.js

@@ -122,7 +122,7 @@ export function routeofadministration(params) {
 }
 
 export function getGoodInventoryList(params){
-  
+
   return request({
     url:"/api/pharmacy/getgoodinventorylist",
     method:"Get",
@@ -131,7 +131,7 @@ export function getGoodInventoryList(params){
 }
 
 export function getGoodInventoryByGoodId(id,params){
-  
+
   return request({
     url:"/api/pharmacy/getgoodinventorybygoodid?id="+id,
     method:"get",
@@ -140,13 +140,13 @@ export function getGoodInventoryByGoodId(id,params){
 }
 
 export function updateInventoryWarehouseInfo(params){
-  
+
   return request({
     url:"/api/pharmacy/updateInventoryWarehouseInfo",
     method:"get",
     params:params,
   })
-} 
+}
 
 export function getDrugInventoryList(params){
 
@@ -175,6 +175,14 @@ export function updateDrugInventoryWarehouseInfo(params){
   })
 }
 
+export function changeZeroFlag(params){
+  return request({
+    url:"/api/pharmacy/changeZeroFlag",
+    method:"get",
+    params:params,
+  })
+}
+
 export function changeDrugCode(params){
 
   return request({
@@ -182,4 +190,4 @@ export function changeDrugCode(params){
     method:"get",
     params:params,
   })
-}
+}

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -250,6 +250,18 @@
             </el-table-column>
 
 
+
+            <el-table-column align="center"  width="100" label="拆零标志">
+              <template slot-scope="scope">
+                <el-select  v-model="scope.row.ZeroFlag" placeholder="请选择" @change="changevalue(scope.row)">
+                  <el-option label="未知" value="0"></el-option>
+                  <el-option label="是" value="1"></el-option>
+                  <el-option label="否" value="2"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+
+
             <el-table-column label="备注" width="170" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Remarks ? scope.row.Remarks : "" }}</span>
@@ -338,7 +350,9 @@ import {
   dispensingmedicine,
   drugwithdrawal,
   getpartitionlist,
-  changeDrugCode
+  changeDrugCode,
+  changeZeroFlag
+
 } from "@/api/pharmacy";
 import dataDruguse from "../../router/modules/dataDruguse";
 import axios from 'axios'
@@ -413,6 +427,17 @@ export default {
     // this.selectedbydefault();
   },
   methods: {
+    changevalue(row){
+      var params = {
+        id:row.ID,
+        zero_flag:row.zero_flag,
+      }
+      changeZeroFlag(params).then(response=>{
+        if(response.data.state == 1){
+          this.$message.success("切换成功")
+        }
+      })
+    },
     getgetpartitionlist() {
       var params = {};
       getpartitionlist(params).then((res) => {

src/xt_pages/drugSourceCode/drugChange.vue

@@ -113,11 +113,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="盘存日期">
-          <template slot-scope="scope">
-            <div>{{scope.row.pc_date}}</div>
-          </template>
-        </el-table-column>
+
 
         <el-table-column label="操作" width="200">
           <template slot-scope="scope">
@@ -183,17 +179,7 @@
         </el-table-column>
 
 
-        <el-table-column align="center" prop="total" label="盘存状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
-          </template>
-        </el-table-column>
 
-        <el-table-column align="center" prop="total" label="盘存日期">
-          <template slot-scope="scope">
-            <div>{{scope.row.pc_date}}</div>
-          </template>
-        </el-table-column>
 
       </el-table>
     </div>
@@ -356,6 +342,10 @@ export default {
 
     },
     sigle_stock(row){
+       if(row.drug_code.length == 0){
+         this.$message.error("追溯码不能为空");
+         return
+       }
       var that = this;
       let params = {
         ids:row.id,
@@ -464,7 +454,6 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
     change_stock(){
-
       let ids  = ""
       for (var i = 0; i < this.selection.length; i++){
         if (ids.length == 0){

src/xt_pages/drugSourceCode/drugCodeQuery.vue

@@ -94,9 +94,9 @@
         <el-table-column align="center" prop="name" label="操作" width="200">
           <template slot-scope="scope">
             <div>
-             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">撤销</el-button>
-            <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>
-            <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>
+             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="revokeDrugCode(scope.row)">撤销</el-button>
+            <el-button type="primary" v-if="scope.row.is_upload == 0" @click="toUpload(scope.row)">上传</el-button>
+<!--            <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>-->
             </div>
           </template>
         </el-table-column>
@@ -189,7 +189,61 @@
       }
     },
     methods: {
-        changeText(event){
+      revokeDrugCode(row){
+        let ids  = row.id
+        var that = this;
+        let params = {
+          id:ids,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        };
+        axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
+          if (response.data.state == 0) {
+            // that.$message.error(response.data.data.msg);
+            that.$confirm("请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+            })
+              .catch(() => {});
+            return false
+          } else {
+            axios.get('http://127.0.0.1:9532/api/delete_xs_bg_three',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.getlist()
+                }
+              }
+            }).catch(function(error) {
+            })
+          }
+        }).catch(function(error) {
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {});
+        })
+
+
+
+      },
+      changeText(event){
         // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
         if (event.key === 'Enter') {
             var textarea = ""
@@ -197,7 +251,7 @@
             this.textarea = textarea
         }
        },
-       getDrugCode(id,DataSources,DrugCode,index){
+      getDrugCode(id,DataSources,DrugCode,index){
             this.id = id
             this.textarea = DrugCode
             this.currentIndex = index
@@ -222,7 +276,7 @@
          }
       })
     },
-    getPatientName(id){
+      getPatientName(id){
        var name = ""
        for(let i=0;i<this.patientList.length;i++){
           if(id == this.patientList[i].id){
@@ -372,21 +426,64 @@
         this.end_time = val
       },
       toUpload(row){
-        if(row.is_medicine == 0 || row.is_is_medicine == 2){
-          this.$message.error("该药品未发药,请先发药")
-          this.faShow = true
+        if(row.drug_code.length == 0){
+          this.$message.error("追溯码不能为空");
           return
         }
-        var params = {
-          drug_id:row.drug_id,
-          patient_id:row.patient_id,
-         advice_date:row.advice_date,
-        }
-        createUploadDrugCode(params).then(response=>{
-          if(response.data.state == 1){
-            this.$message.success("上传成功!")
+        let ids  = row.id
+        var that = this;
+        let params = {
+          id:ids,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        };
+
+        axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
+          if (response.data.state == 0) {
+            // that.$message.error(response.data.data.msg);
+            that.$confirm("请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+
+            })
+              .catch(() => {});
+            return false
+          } else {
+
+            //有打开则调用接口
+            axios.get('http://127.0.0.1:9532/api/delete_xs_bg_three',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.getlist()
+                }
+              }
+            }).catch(function(error) {
+            })
           }
+        }).catch(function(error) {
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {});
         })
+
+
       },
       toFaYao(row){
 

src/xt_pages/drugSourceCode/drugQuery.vue

@@ -633,169 +633,168 @@ export default {
             type: "warning",
           }).then(() => {
 
-            this.tableData = []
-            if(that.stock_type == 1){
-
-              axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.data.msg);
-                  return false
-                } else {
-                  if(response.data.data.failed_code == -10){
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-                  }else{
-                    that.tableData = that.tableData.concat(response.data.data.info)
-
-                  }
-                }
-              }).catch(function(error) {
-              })
-
-            }else if(that.stock_type == 2){
-              axios.get('http://127.0.0.1:9532/api/3509',{params:params}).then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.data.msg);
-                  return false
-                } else {
-                  if(response.data.data.failed_code == -10){
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-                  }else{
-                    that.tableData = that.tableData.concat(response.data.data.info)
-
-                  }
-                }
-              }).catch(function(error) {
-              })
-
-            }else if(that.stock_type == 3){
-              axios.get('http://127.0.0.1:9532/api/3511',{params:params}).then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.data.msg);
-                  return false
-                } else {
-                  if(response.data.data.failed_code == -10){
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-                  }else{
-                    that.tableData = that.tableData.concat(response.data.data.info)
-
-                  }
-                }
-              }).catch(function(error) {
-              })
-
-            }else if(that.stock_type == 4){
-              axios.get('http://127.0.0.1:9532/api/3512',{params:params}).then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.data.msg);
-                  return false
-                } else {
-                  if(response.data.data.failed_code == -10){
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-                  }else{
-                    that.tableData = that.tableData.concat(response.data.data.info)
-
-                  }
+
+          })
+            .catch(() => {});
+          return false
+        } else {
+
+          this.tableData = []
+          if(that.stock_type == 1){
+
+            axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.tableData = that.tableData.concat(response.data.data.info)
+
                 }
-              }).catch(function(error) {
-              })
-
-            }else if(that.stock_type == 5){
-              axios.get('http://127.0.0.1:9532/api/3513',{params:params}).then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.data.msg);
-                  return false
-                } else {
-                  if(response.data.data.failed_code == -10){
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-                  }else{
-                    that.tableData = that.tableData.concat(response.data.data.info)
-
-                  }
+              }
+            }).catch(function(error) {
+            })
+
+          }else if(that.stock_type == 2){
+            axios.get('http://127.0.0.1:9532/api/3509',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.tableData = that.tableData.concat(response.data.data.info)
+
                 }
-              }).catch(function(error) {
-              })
-
-            }else if(this.stock_type == 6){
-              axios.get('http://127.0.0.1:9532/api/35081',{params:params}).then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.data.msg);
-                  return false
-                } else {
-                  if(response.data.data.failed_code == -10){
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-                  }else{
-                    that.tableData = that.tableData.concat(response.data.data.info)
-
-                  }
+              }
+            }).catch(function(error) {
+            })
+
+          }else if(that.stock_type == 3){
+            axios.get('http://127.0.0.1:9532/api/3511',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.tableData = that.tableData.concat(response.data.data.info)
+
                 }
-              }).catch(function(error) {
-              })
-
-            }else if(that.stock_type == 7){
-              axios.get('http://127.0.0.1:9532/api/35082',{params:params}).then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.data.msg);
-                  return false
-                } else {
-                  if(response.data.data.failed_code == -10){
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-
-                    }).catch(() => {
-                    })
-                  }else{
-                    that.tableData = that.tableData.concat(response.data.data.info)
-
-                  }
+              }
+            }).catch(function(error) {
+            })
+
+          }else if(that.stock_type == 4){
+            axios.get('http://127.0.0.1:9532/api/3512',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.tableData = that.tableData.concat(response.data.data.info)
+
                 }
-              }).catch(function(error) {
-              })
-            }
+              }
+            }).catch(function(error) {
+            })
+
+          }else if(that.stock_type == 5){
+            axios.get('http://127.0.0.1:9532/api/3513',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.tableData = that.tableData.concat(response.data.data.info)
 
+                }
+              }
+            }).catch(function(error) {
+            })
+
+          }else if(this.stock_type == 6){
+            axios.get('http://127.0.0.1:9532/api/35081',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.tableData = that.tableData.concat(response.data.data.info)
 
-          })
-            .catch(() => {});
-          return false
-        } else {
+                }
+              }
+            }).catch(function(error) {
+            })
+
+          }else if(that.stock_type == 7){
+            axios.get('http://127.0.0.1:9532/api/35082',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.tableData = that.tableData.concat(response.data.data.info)
 
+                }
+              }
+            }).catch(function(error) {
+            })
+          }
         }
       }).catch(function(error) {
         that.$confirm("请检查医保程序是否有打开", "提示", {

src/xt_pages/drugSourceCode/drugStock.vue

@@ -85,6 +85,10 @@
           <template slot-scope="scope">{{scope.row.drug_code}}</template>
         </el-table-column>
 
+        <el-table-column  width="100px"   align="center" prop="name" label="追溯码数量">
+          <template slot-scope="scope">{{getCount(scope.row.drug_code)}}</template>
+        </el-table-column>
+
         <el-table-column align="center" prop="name" label="批号">
           <template slot-scope="scope">{{scope.row.batch_number}}</template>
         </el-table-column>
@@ -238,11 +242,29 @@ export default {
     }
   },
   methods: {
+    getCount(code){
+
+      let noNewLineStr = code.replace(/\n/g, "");
+      // 按逗号分割成数组
+      let resultArray = noNewLineStr.split(",");
+      var arr = []
+      for(let i = 0;i < resultArray.length;i++){
+        if(resultArray[i] != ""){
+
+          arr.push(resultArray[i])
+        }
+      }
+      return arr.length
+    },
     searchAction(){
 
 
     },
     sigle_stock(row){
+      if(row.drug_code.length == 0){
+        this.$message.error("追溯码不能为空");
+        return
+      }
       let ids  = row.id
       var that = this;
 
@@ -314,9 +336,6 @@ export default {
         admin_user_id:this.$store.getters.xt_user.user.id
       };
 
-
-
-
       axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
           // that.$message.error(response.data.data.msg);

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -226,6 +226,28 @@
             </template>
           </el-table-column>
 
+
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>当前溯源码数量</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.drug_code_cnt'"
+                style="padding-top: 10px"
+              >
+                <div style="display: flex">
+                  <el-input
+                    placeholder="请输入入库数量"
+                    v-model="scope.row.drug_code_cnt"
+                    style="width: 120px"
+                    disabled
+                  ></el-input>
+                </div>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
           <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>拆零零售价(元)<span style="color: red">*</span></span>
@@ -582,10 +604,21 @@ export default {
       this.dialogVisible = true
     },
     saveTextArea(){
-
       for(let i=0;i<this.recordInfo.recordData.length;i++){
          if(this.currentIndex == i){
-           this.recordInfo.recordData[i].drug_code = this.textarea 
+           this.recordInfo.recordData[i].drug_code = this.textarea
+           // 去除换行符
+           let noNewLineStr = this.textarea.replace(/\n/g, "");
+          // 按逗号分割成数组
+           let resultArray = noNewLineStr.split(",");
+           let arr = []
+           for(let c = 0; c < resultArray.length; c++){
+             if(resultArray[c] != ""){
+               arr.push(resultArray[c])
+             }
+           }
+           this.recordInfo.recordData[i].drug_code_cnt = arr.length
+
          }
       }
       this.dialogVisible = false
@@ -754,7 +787,9 @@ export default {
       tempObj["last_price"] = "";
       tempObj["count_unit"] = "";
       tempObj["min_number"] = "";
-      tempObj["drug_code"] = ""
+      tempObj["drug_code"] = "";
+      tempObj["drug_code_cnt"] = "";
+
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -881,6 +916,24 @@ export default {
             }
           }
 
+          if(this.$store.getters.xt_user.org_id == 0 || this.this.$store.getters.xt_user.org_id == 10138 || this.this.$store.getters.xt_user.org_id == 10278 || this.this.$store.getters.xt_user.org_id == 10610 ||  this.this.$store.getters.xt_user.org_id == 10537 ) {
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].drug_code.length == 0) {
+                this.$message.error(array[i].drug_name + " 药品溯源码不能为空");
+                this.loading = false;
+                return;
+              }
+              var aaa =  array[i].drug_code.split(",")
+              if(new Set(aaa).size !== aaa.length){
+                this.$message.error( array[i].drug_name + " 溯源码不能重复");
+                this.loading = false;
+                return;
+
+              }
+            }
+          }
+          return
+
           if (this.recordInfo.recordData.length <= 0) {
             this.$message.success("请添加入库商品");
             this.loading = false;
@@ -1170,10 +1223,10 @@ export default {
     //  }
     },
     getTotalPirce(){
-      
+
       var total_price = 0
       if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
-        
+
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            total_price += this.recordInfo.recordData[i].last_price * parseInt(this.recordInfo.recordData[i].warehousing_count)
         }
@@ -1195,7 +1248,7 @@ export default {
       }
    },
   },
- 
+
   created() {
     if (this.$route.path == "/Pharmacy/in/add") {
       this.crumbs = [
@@ -1239,6 +1292,7 @@ export default {
     tempObj["count_unit"] = "";
     tempObj["min_number"] = "";
     tempObj["drug_code"] = ""
+    tempObj["drug_code_cnt"] = ""
     this.recordInfo.recordData.push(tempObj);
 
     this.GetConfigInfo();

src/xt_pages/stock/stockInOrderAdd.vue

@@ -121,6 +121,27 @@
             </template>
           </el-table-column>
 
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>当前溯源码数量</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.good_code_cnt'"
+                style="padding-top: 10px"
+              >
+                <div style="display: flex">
+                  <el-input
+                    placeholder="请输入入库数量"
+                    v-model="scope.row.good_code_cnt"
+                    style="width: 120px"
+                    disabled
+                  ></el-input>
+                </div>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>零售价<span style="color: red">*</span></span>
@@ -225,7 +246,7 @@
             </template>
           </el-table-column>
 
-          
+
            <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
@@ -240,13 +261,13 @@
           </el-table-column>
 
           <el-table-column label="耗材追溯码" align="center" width="150">
-           
+
               <template slot-scope="scope">
                <div  @click="changeGoodCode(scope.row,scope.$index)">
                 <el-input v-model="scope.row.good_code"  placeholder="请输入耗材追溯码"></el-input>
               </div>
             </template>
-          
+
           </el-table-column>
 
           <el-table-column label="备注" align="center" width="150">
@@ -284,7 +305,7 @@
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
 
- 
+
     </div>
 
     <el-dialog
@@ -615,6 +636,8 @@
         tempObj["id"] = 0
         tempObj['register_number'] = ''
         tempObj['good_code'] = ""
+        tempObj['good_code_cnt'] = ''
+
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -764,6 +787,26 @@
               array[i].packing_price = array[i].packing_price.toString()
             }
 
+            if(this.$store.getters.xt_user.org_id == 0 || this.this.$store.getters.xt_user.org_id == 10138 || this.this.$store.getters.xt_user.org_id == 10278 || this.this.$store.getters.xt_user.org_id == 10610 ||  this.this.$store.getters.xt_user.org_id == 10537 ) {
+              for (let i = 0; i < array.length; i++) {
+                if (array[i].good_code.length == 0) {
+                  this.$message.error(array[i].good_name  + " 溯源码不能为空");
+                  this.loading = false;
+                  return;
+                }
+
+
+                var aaa =  array[i].good_code.split(",")
+                if(new Set(aaa).size !== aaa.length){
+                  this.$message.error( array[i].good_name + " 溯源码不能重复");
+                  this.loading = false;
+                  return;
+
+                }
+              }
+            }
+
+
             if(this.recordInfo.recordData.length <= 0){
               this.$message.success('请添加入库商品')
               return
@@ -799,7 +842,7 @@
               'stockIn': this.recordInfo.recordData
             }
             console.log("param232232323232323w",params)
-   
+
             postWarehouse(params, this.warehousing_time, this.type,this.storehouse_id,this.warehousing_info_id).then(response => {
               if (response.data.state == 0) {
                 this.loading = false
@@ -992,10 +1035,10 @@
        })
      },
      getTotalPirce(){
-      
+
        var total_price = 0
        if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
-         
+
          for(let i=0;i<this.recordInfo.recordData.length;i++){
             total_price += this.recordInfo.recordData[i].price * parseInt(this.recordInfo.recordData[i].warehousing_count)
          }
@@ -1026,7 +1069,20 @@
      saveTextArea(){
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
-            this.recordInfo.recordData[i].good_code = this.textarea 
+            this.recordInfo.recordData[i].good_code = this.textarea
+
+            // 去除换行符
+            let noNewLineStr = this.textarea.replace(/\n/g, "");
+            // 按逗号分割成数组
+            let resultArray = noNewLineStr.split(",");
+            let arr = []
+            for(let c = 0; c < resultArray.length; c++){
+              if(resultArray[c] != ""){
+                arr.push(resultArray[c])
+              }
+            }
+            this.recordInfo.recordData[i].good_code_cnt = arr.length
+
           }
         }
         this.dialogVisible = false
@@ -1065,6 +1121,9 @@
       tempObj['id']= 0
       tempObj['register_number'] = ''
       tempObj['good_code'] = ''
+        tempObj['good_code_cnt'] = ''
+
+
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit