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

src/api/inout/code.js

@@ -68,4 +68,12 @@ export function getCodeListForEdit(params){
   });
 }
 
+export function checkTempCode(query) {
+    return axios({
+        url: "warehouse/inout/checkTempCode",
+        method: "post",
+        data: query
+    });
+}
+
 

src/views/inout/DialogCreateOrder.vue

@@ -1209,6 +1209,7 @@ export default {
             this.codeFormData.expireDate = response.data.expireDate;
             this.codeFormData.batchNo = response.data.batchNo;
             this.codeFormData.serialNo = response.data.serialNo;
+            this.codeFormData.corpOrderId = this.orderFormData.corpOrderId;
             this.$message({
               type: "error",
               message: "提交失败！" + this.editTitle,

src/views/inout/DialogEditCode.vue

@@ -5,9 +5,9 @@
         <el-col :span="20">
           <el-form-item label="UDI码:" prop="code">
             <el-input
-              v-model="editData.code"
+                v-model="editData.code"
-              clearable
+                clearable
-              disabled
+                disabled
             ></el-input>
           </el-form-item>
         </el-col>
@@ -72,6 +72,7 @@
 <script>
 
 import {
+  checkTempCode,
   findByCode,
   saveCode, tabCode
 } from "@/api/inout/code";
@@ -113,7 +114,20 @@ export default {
   methods: {
     saveCode() {
       if (this.editType == 1) {
-        this.repeatAddCode(this.editData);
+        //校验该单有没有存在同序列号的码
+        if (!isBlank(this.editData.serialNo)) {
+          checkTempCode(this.editData).then((response) => {
+            if (response.code === 20000) {
+              this.repeatAddCode(this.editData);
+              return
+            } else {
+              this.$message.error(response.message);
+              return
+            }
+          });
+        }else{
+          this.repeatAddCode(this.editData);
+        }
 
         // tabCode(this.editData)
         //   .then((response) => {
@@ -128,17 +142,17 @@ export default {
 
       } else {
         saveCode(this.editData)
-          .then((response) => {
+            .then((response) => {
-            console.log(response)
+              console.log(response)
-            if (response.code === 20000) {
+              if (response.code === 20000) {
-              this.$message.success("提交成功");
+                this.$message.success("提交成功");
-              this.codeDetail = this.editData;
+                this.codeDetail = this.editData;
-              this.closeCodeDialog();
+                this.closeCodeDialog();
-            } else {
+              } else {
-              this.$message.error(response.message);
+                this.$message.error(response.message);
-            }
+              }
-            this.loading = false;
+              this.loading = false;
-          });
+            });
       }
 
     }
@@ -150,18 +164,18 @@ export default {
     findByCode() {
       let query = {udiCode: this.editData.code};
       findByCode(query)
-        .then((response) => {
+          .then((response) => {
-          if (response.code === 20000) {
+            if (response.code === 20000) {
-            if (response.data.scbssfbhxlh == "否") {
+              if (response.data.scbssfbhxlh == "否") {
-              this.xlhEnable = true;
+                this.xlhEnable = true;
-            }
+              }
-            if (response.data.zxxsbzbhsydysl > 1) {
+              if (response.data.zxxsbzbhsydysl > 1) {
-              this.isUseDyCheck = true;
+                this.isUseDyCheck = true;
+              }
+            } else {
             }
-          } else {
+            this.loading = false;
-          }
+          });
-          this.loading = false;
-        });
     }
 
   }
@@ -171,17 +185,17 @@ export default {
     this.editData = JSON.parse(JSON.stringify(this.codeDetail));
     this.findByCode();
     //判断三区有数据的不允许修改
-    if(isBlank(this.editData.produceDate)){
+    if (isBlank(this.editData.produceDate)) {
-      this.isProduceDate=true
+      this.isProduceDate = true
     }
-    if(isBlank(this.editData.expireDate)){
+    if (isBlank(this.editData.expireDate)) {
-      this.isExpireDate=true
+      this.isExpireDate = true
     }
-    if(isBlank(this.editData.batchNo)){
+    if (isBlank(this.editData.batchNo)) {
-      this.isBatchNo=true
+      this.isBatchNo = true
     }
-    if(isBlank(this.editData.serialNo)){
+    if (isBlank(this.editData.serialNo)) {
-      this.isSerialNo=true
+      this.isSerialNo = true
     }
   }
 }

src/views/inout/DialogInvoice.vue

@@ -50,7 +50,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="code">
-              <el-input v-model="inputQuery.invoiceCode" auto-complete="off" ></el-input>
+              <el-input v-model="inputQuery.invoiceEncode" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -62,7 +62,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="name">
-              <el-input v-model="inputQuery.invoiceEncode" auto-complete="off" ></el-input>
+              <el-input v-model="inputQuery.invoiceCode" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
 

src/views/inout/InvoiceRegByOrder.vue

@@ -104,6 +104,14 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="确认状态：" prop="confirmStatus">
+              <el-select v-model="filterQuery.confirmStatus" placeholder="请选择确认状态" clearable="true" style="width: 90%" @change="invChange">
+                <el-option label="确认" :value="1"></el-option>
+                <el-option label="未确认" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="备注:">
               <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%" clearable="true"></el-input>
@@ -236,7 +244,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="发票编码"
+            label="发票代码"
             prop="invoiceCodes"
             width="150"
             show-overflow-tooltip
@@ -338,8 +346,9 @@
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
             label="发票代码" width="150"
-            prop="invoiceCode"
+            prop="invoiceEncode"
           ></el-table-column>
+
           <el-table-column
             label="物资名称"
             prop="cpmctymc" width="150"
@@ -362,7 +371,7 @@
           ></el-table-column>
           <el-table-column
             label="发票编码" width="150"
-            prop="invoiceEncode"
+            prop="invoiceCode"
           ></el-table-column>
           <el-table-column
             label="开票日期" width="150"
@@ -565,6 +574,7 @@ export default {
         endTime: null,
         invCode: null,
         unionRemark: null,
+        confirmStatus: null,
       },
       determineVisible: false,
       determineData: null,

src/views/inout/IoCheckAuditOrder.vue

@@ -164,7 +164,7 @@
         </el-table-column>
         <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="操作" width="220" fixed="right">
+        <el-table-column label="操作" width="165" fixed="right">
           <template slot-scope="scope">
 
             <el-button
@@ -199,13 +199,13 @@
             </el-button
             >
 
-            <el-button
+<!--            <el-button-->
-              type="text"
+<!--              type="text"-->
-              size="small"
+<!--              size="small"-->
-              @click.native.stop="deleteDialog(scope.row)"
+<!--              @click.native.stop="deleteDialog(scope.row)"-->
-            >删除
+<!--            >删除-->
-            </el-button
+<!--            </el-button-->
-            >
+<!--            >-->
 
           </template>
         </el-table-column>