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

src/views/mes/md/product/index.vue

@@ -53,6 +53,15 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="品牌名称" prop="brandName">
+            <el-input
+              v-model="queryParams.brandName"
+              placeholder="请输入物料名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button
               type="primary"
@@ -111,14 +120,13 @@
             >转正式产品</el-button
             >
           </el-col>
-          <!--          <el-col :span="1.5">
+          <el-col :span="1.5">
             <el-button
               type="info"
               plain
               icon="el-icon-upload2"
               size="mini"
               @click="handleImport"
-              v-hasPermi="['mes:md:mditem:import']"
             >导入</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -128,9 +136,8 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['mes:md:mditem:export']"
             >导出</el-button>
-          </el-col>-->
+          </el-col>
           <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
@@ -179,6 +186,15 @@
             v-if="columns[1].visible"
             :show-overflow-tooltip="true"
           />
+          <el-table-column
+            label="品牌名称"
+            min-width="120"
+            align="left"
+            key="brandName"
+            prop="brandName"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
           <el-table-column
             label="规格型号"
             align="left"
@@ -296,32 +312,13 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="物料编码" prop="itemCode">
               <el-input
                 v-model="form.itemCode"
                 readonly="readonly"
                 maxlength="64"
-                v-if="optType == 'view'"
               />
-              <el-input
-                v-model="form.itemCode"
-                placeholder="物料编码"
-                maxlength="64"
-                v-else
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label-width="80">
-              <el-switch
-                v-model="autoGenFlag"
-                active-color="#13ce66"
-                active-text="自动生成"
-                @change="handleAutoGenChange(autoGenFlag)"
-                v-if="optType != 'view'"
-              >
-              </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -738,7 +735,7 @@ export default {
       // 部门名称
       itemTypeName: undefined,
       //自动生成物料编码标识
-      autoGenFlag: false,
+      autoGenFlag: true,
       // 日期范围
       dateRange: [],
       //单位列表
@@ -872,7 +869,7 @@ export default {
         optType: undefined,
         remark: undefined,
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -907,6 +904,7 @@ export default {
     handleAdd() {
       this.reset();
       this.getTreeselect();
+      this.handleAutoGenChange(true)
       if (this.queryParams.itemTypeId != 0) {
         this.form.itemTypeId = this.queryParams.itemTypeId;
       }
@@ -1006,7 +1004,7 @@ export default {
         {
           ...this.queryParams,
         },
-        `user_${new Date().getTime()}.xlsx`
+        `md_item_${new Date().getTime()}.xlsx`
       );
     },
     /** 导入按钮操作 */
@@ -1046,7 +1044,6 @@ export default {
     },
     //自动生成物料编码
     handleAutoGenChange(autoGenFlag) {
-      debugger;
       if (autoGenFlag) {
         genCode("ITEM_CODE").then((response) => {
           this.form.itemCode = response;