Merge remote-tracking branch 'origin/master'

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/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;