Merge remote-tracking branch 'origin/master'

src/views/inout/DialogInvoice.vue

@@ -9,14 +9,14 @@
         </el-button-group>
         <el-row>
           <el-col :span="11">
-            <el-form-item label="规格型号:" prop="code">
+            <el-form-item label="规格型号:" prop="ggxh">
               <el-input v-model="inputQuery.ggxh" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="11">
-            <el-form-item label="物资名称:" prop="code">
+            <el-form-item label="物资名称:" prop="cpmctymc">
               <el-input v-model="inputQuery.cpmctymc" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
@@ -24,14 +24,14 @@
 
         <el-row >
           <el-col :span="11">
-            <el-form-item  label="机械编码:" prop="name">
+            <el-form-item  label="机械编码:" prop="machineNo">
               <el-input v-model="inputQuery.machineNo" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="11">
-            <el-form-item label="发票代码:" prop="code">
+            <el-form-item label="发票代码:" prop="invoiceCode">
               <el-input v-model="inputQuery.invoiceCode" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
@@ -160,10 +160,10 @@ export default {
         licenseUrl:""
       },
       formRules: {
-        name: [
+        machineNo: [
           {required: true, message: "请输入机械编码", trigger: "blur"}
         ],
-        code: [
+        invoiceCode: [
           {required: true, message: "请输入发票代码", trigger: "blur"}
         ],
         invoiceEncode: [

src/views/inout/InvoiceRegistration.vue

@@ -690,6 +690,7 @@ export default {
       }
 
       this.filterQuery.page = 1;
+      this.filterQuery.supInoivceSearch=null;
       this.getList();
     },
     hideSearch() {

src/views/inout/IoDeliveryAuditOrder.vue

@@ -158,7 +158,7 @@
         </el-table-column>
         <el-table-column label="收货仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="核对人" prop="reviewUserName" width="120">
+        <el-table-column label="核对人" prop="checkUserName" width="120">
         </el-table-column>
         <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="来源" prop="fromType" width="120">

src/views/inventory/InvSupPreProducts.vue

@@ -173,7 +173,7 @@ export default {
         supId: null,
         zczbhhzbapzbh: null,
         ylqxzcrbarmc: null,
-        invCode: this.$store.getters.locInvCode,
+        invCode: null,
         page: 1,
         limit: 10,
       },

src/views/supplier/company/basicCompanyProducts.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="物资编码:">
-              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入产品编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>