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

src/layout/components/Navbar.vue

@@ -13,7 +13,7 @@
               style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门&nbsp:&nbsp{{ deptName }}</span>
           <span
             style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库&nbsp:&nbsp{{ inv }}</span>
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp吴XX{{ this.companyName }}</span>
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{ this.companyName }}</span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
               this.userName
@@ -434,6 +434,7 @@ export default {
   },
   created() {
     this.userName = this.$store.getters.name;
+    this.companyName = this.$store.getters.companyName;
     this.userInfo = {
       id: store.getters.adminId,
       locInvCode: store.getters.locInvCode,

src/views/inout/InvoiceRegByFp.vue

@@ -346,7 +346,7 @@
 
 
     <el-dialog
-        title="确定"
+        title="发票—确认登记"
         :visible.sync="determineVisible"
         width="80%"
         :close-on-click-modal="false"

src/views/inout/InvoiceRegByOrder.vue

@@ -185,6 +185,7 @@
             </el-tag>
           </template>
         </el-table-column>
+
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
@@ -479,7 +480,7 @@
     </el-dialog>
 
     <el-dialog
-      title="确定"
+      title="发票—确认登记"
       :visible.sync="determineVisible"
       width="80%"
       :close-on-click-modal="false"

src/views/inout/IoAuditedOrder.vue

@@ -230,7 +230,7 @@
           </el-form-item>
         </el-form>
 
-        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+        <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>

src/views/inout/IoCheckErrorOrder.vue

@@ -143,7 +143,7 @@
         </el-table-column>
         <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="操作" width="150">
+        <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"

src/views/inout/IoDealOrder.vue

@@ -418,6 +418,7 @@ export default {
         "12": "采购计划",
         "13": "领用单据",
         "14": "第三方系统单据",
+        "15": "采购计划转单",
       },
       deleteData: {
         billNo: "",

src/views/inout/muti/ioOrderMutiEditDialog.vue

@@ -10,7 +10,7 @@
           <el-col :span="17">
             <el-form-item label="UDI:">
               <el-input v-model="inputQuery.udiCode" ref="udiCodeInputRef" @keypress.enter.native="addCode($event)"
-                        :disabled="detailList.length>0" placeholder="请输入UDI" clearable></el-input>
+                        :disabled="detailList.length>0 || this.formName==2" placeholder="请输入UDI" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="2">
@@ -220,6 +220,7 @@ export default {
           this.pId = response.data;
           filterMutiList({id: this.pId}).then((response) => {
             if (response.code == 20000) {
+              this.showFlg=true;
               this.inputQuery.cpmctymc = response.data.data.cpmctymc
               this.inputQuery.ggxh = response.data.data.ggxh
               this.inputQuery.totalCount = response.data.data.totalCount
@@ -257,7 +258,8 @@ export default {
                         this.inputQuery.useCount = response.data.data.useCount
                         this.$refs.fromCorpInputRef.focus();
                         this.checkType=null;
-                        this.showFlg=false;
+                        this.showFlg=true;
+                        this.formName=2
                         this.enterKeyup();
                       } else {
                         this.$refs.markInputRef.focus();
@@ -427,6 +429,7 @@ export default {
           this.inputQuery.useCount = response.data.useCount
           this.pId = response.data.id;
           this.showFlg=true;
+          this.formName=2
           this.$refs.fromCorpInputRef.focus();
           this.selectMutiDetailList()
         } else {

src/views/purchase/product/supProductEditDialog.vue

@@ -551,7 +551,13 @@ export default {
         }
       }
       if(val==3){
-        this.$confirm( "已审核通过，是否需要重新提交变更", {
+    let msg =null;
+    if(this.inputQuery.auditStatus == 1 || this.inputQuery.auditStatus == 4){
+      msg = "已审核通过，是否需要重新提交变更";
+    }else if(this.inputQuery.auditStatus == 2){
+      msg = "审核拒绝，是否需要重新提交变更";
+    }
+        this.$confirm( msg, {
           confirmButtonText: "确定",
           type: "warning",
           showCancelButton: false,