Merge remote-tracking branch 'origin/dev' into dev

.env.production

@@ -31,13 +31,13 @@ ENV = 'production'
 #  VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 # 漳州中医院
-VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 # 片仔癀诊断
 # VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'

src/api/inout/order.js

@@ -48,6 +48,7 @@ export function submitBiz(query) {
     data: query
   });
 }
+
 export function delmitBiz(query) {
   return axios({
     url: "/warehouse/inout/delmitBiz",

src/views/inout/DialogReviewOrder.vue

@@ -180,6 +180,9 @@ export default {
         originCode: this.originCode,
         code: this.udiCode.trim(),
       }
+      if (tQuery.code.includes(tQuery.originCode.substr(0, tQuery.originCode.length - 1))) {
+        tQuery.originCode = "";
+      }
       enterCodeWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.$refs.inputRef.focus();

src/views/inout/DialogThrReviewOrder.vue

@@ -189,6 +189,9 @@ export default {
         originCode: this.originCode,
         code: this.udiCode.trim(),
       }
+      if (tQuery.code.includes(tQuery.originCode.substr(0,tQuery.originCode.length-1))) {
+        tQuery.originCode = "";
+      }
       enterCodeWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.$refs.inputRef.focus();
@@ -203,8 +206,6 @@ export default {
             this.originCode = this.udiCode;
           } else if (response.code == 501) {
             this.checkSuccess = false;
-            // this.$refs.inputRef.focus();
-            // this.$refs.inputRef.select();
             this.originCode = "";
             this.$message.error(response.message);
           } else if (response.code == 503) {

src/views/inout/InvoiceRegByFp.vue

@@ -253,6 +253,11 @@
               prop="count"
               width="100"
           ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+            width="100"
+          ></el-table-column>
           <el-table-column
               label="价格"
               prop="price"
@@ -283,11 +288,7 @@
               prop="certCode"
               show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
+
-              label="扫码数量"
-              prop="reCount"
-              width="100"
-          ></el-table-column>
         </el-table>
         <pagination
             v-show="productTotal>0"
@@ -311,6 +312,7 @@
           <el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
           <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
           <el-table-column label="数量" prop="count" width="100"></el-table-column>
+          <el-table-column label="扫码数量" prop="reCount" width="100"></el-table-column>
           <el-table-column label="价格" prop="price" width="100"></el-table-column>
           <el-table-column label="金额" prop="amount" width="100"></el-table-column>
           <el-table-column label="生产日期" prop="productDate" width="100"></el-table-column>
@@ -318,7 +320,7 @@
           <el-table-column width="100" label="计量单位" prop="measname"></el-table-column>
           <el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案号" width="160" prop="certCode" show-overflow-tooltip></el-table-column>
-          <el-table-column label="扫码数量" prop="reCount" width="100"></el-table-column>
+
         </el-table>
         <pagination
             v-show="codeTotal>0"
@@ -449,7 +451,7 @@ export default {
 
       imgList: [],
       imgViewerVisible: false,
-
+      cowEn:null,
       //单据相关参数
       orderLoading: false,
       orderList: [],
@@ -686,6 +688,7 @@ export default {
       // this.resultDetailList = [];
     },
     handleInvoiceChange(val) {
+      this.cowEn=val;
       this.getOrderList(val)
       this.getProductDetailList(val)
     },
@@ -694,11 +697,11 @@ export default {
     getProductDetailList(row) {
       this.productDetailLoading = true
       this.productDetailList = []
-      if (row == null || isBlank(row.invoiceEncode)) {
+      if (this.cowEn == null || isBlank(this.cowEn.invoiceEncode)) {
         this.$message.error('请选择对应发票！')
         return
       }
-      this.productQuery.invoiceEncode = row.invoiceEncode
+      this.productQuery.invoiceEncode = this.cowEn.invoiceEncode
       productDetail(this.productQuery).then((res) => {
         this.productDetailLoading = false
         if (res.code === 20000) {

src/views/inout/InvoiceRegCkeck.vue

@@ -334,7 +334,7 @@ export default {
           { required: true, message: '请输入发票编码', trigger: 'blur' }
         ],
         price: [{ required: true, message: '请输入发票价格', trigger: 'blur' }],
-        invoiceDate: [{ required: true, message: '请输入备注', trigger: 'blur' }]
+        invoiceDate: [{ required: true, message: '请选择开票日期', trigger: 'blur' }]
       },
       certFileUrl: '',
       Upinvoice: false,