Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame

src/views/basic/product/udiInfoManageSp.vue

@@ -281,6 +281,7 @@ export default {
       };
       this.total = 0;
       this.list = [];
+      this.getList();
     },
     search() {
       this.filterQuery.page = 1;
@@ -671,7 +672,7 @@ export default {
   }
   ,
   created() {
-    // this.getList();
+    this.getList();
     this.selectSysParam();
     this.getSysFilter();
     this.findMethod();

src/views/inout/DialogSelectReceiveOrder.vue

@@ -90,7 +90,7 @@
           <el-table-column label="单据号" prop="billNo"></el-table-column>
           <el-table-column label="领用仓库" prop="invName"></el-table-column>
           <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="单据日期" prop="billDate"></el-table-column>
+          <el-table-column label="单据日期" prop="createTime"></el-table-column>
           <el-table-column label="状态" prop="status">
             <template slot-scope="scope">
               <el-tag :type="(scope.row.status) | statusFilterType">

src/views/inout/receive/DialogNewReceive.vue

@@ -94,6 +94,12 @@
               <el-input v-model="formData.remark" auto-complete="off"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col v-if="formData.status==4" :span="11">
+            <el-form-item prop="remark" label="拒绝原因:">
+              <el-input :disabled="true" v-model="formData.auditRemark" auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-card>
       <el-card>

src/views/inout/receive/receiveAudit.vue

@@ -10,7 +10,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="领用仓库:">
-              <el-select v-model="filterQuery.targetInvCode" placeholder="请选择领用仓库" style="width: 100%;">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">
                 <el-option
                   v-for="item in invList"
                   :key="item.code"
@@ -243,7 +243,7 @@ export default {
         page: 1,
         limit: 10,
         corpName: null,
-        targetInvCode: this.invCodebe,
+        invCode: this.invCodebe,
         type: 2,
         editStatus: 2,
       };
@@ -334,8 +334,8 @@ export default {
         .then((response) => {
           this.invList = response.data || [];
           if (this.invList.length > 0) {
-            this.filterQuery.targetInvCode = this.invList[0].code
-            this.invCodebe = this.filterQuery.targetInvCode
+            this.filterQuery.invCode = this.invList[0].code
+            this.invCodebe = this.filterQuery.invCode
           }
           this.getList();
         })

src/views/purchase/purPlan/purPlanAudit.vue

@@ -187,9 +187,9 @@ export default {
         4: "已拒绝"
       },
       emergencyMap: {
-        1: "普通",
-        2: "紧急",
-        3: "不紧急",
+        1: "正常",
+        2: "较急",
+        3: "特急",
       },
       invList: {},
       deptList: {},

src/views/purchase/purPlan/purPlanSearch.vue

@@ -328,10 +328,10 @@ export default {
         this.filterQuery.endDate = null;
       }
       if (this.actAuditDateRange != null) {
-        this.filterQuery.starAuditDate = this.actAuditDateRange[0];
+        this.filterQuery.startAuditDate = this.actAuditDateRange[0];
         this.filterQuery.endAuditDate = this.actAuditDateRange[1];
       } else {
-        this.filterQuery.starAuditDate = null;
+        this.filterQuery.startAuditDate = null;
         this.filterQuery.endAuditDate = null;
       }
       this.loading = true;