Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/components/SapPropertyData/index.vue

@@ -76,6 +76,7 @@ export default {
         if (valid) {
           this.loading = true
           this.form.sapData = JSON.stringify(this.sapData)
+          console.log(this.form)
           let handleEdit = this.form.id ? updateData : addData
           handleEdit(this.form).then(() => this.$message.success('操作成功')).finally(() => this.loading = false)
         } else {
@@ -126,6 +127,7 @@ export default {
       this.$refs.form && this.$refs.form.resetFields()
       this.form.type = type
       this.form.relationId = relationId
+      this.form.viewType = viewType
       let sapData = {}
       // 获取sap特性列表
       listByType({type, viewType}).then(res => {

src/views/mes/md/product/components/backFaceColor.vue

 <!--产品正反面颜色-->
 <template>
-<!--  v-hasPermi="['mes:md:faceColor:add']"
-  v-hasPermi="['mes:md:faceColor:remove']"
-  v-hasPermi="['mes:md:faceColor:remove']"
-  v-hasPermi="['mes:md:faceColor:edit']"-->
   <div class="app-container">
     <el-row :gutter="10" class="mb8" v-if="optType !='view'">
       <el-col :span="1.5">
@@ -13,7 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-
+          v-hasPermi="['mes:md:faceColor:add']"
         >新增</el-button>
         <ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect>
       </el-col>
@@ -25,7 +21,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-
+          v-hasPermi="['mes:md:faceColor:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -52,14 +48,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-
+            v-hasPermi="['mes:md:faceColor:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-
+            v-hasPermi="['mes:md:faceColor:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/mes/md/product/components/customerLoss.vue

@@ -9,6 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['md:loss:add']"
           >新增</el-button
         >
       </el-col>
@@ -20,6 +21,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-hasPermi="['md:loss:edit']"
           >修改</el-button
         >
       </el-col>
@@ -31,6 +33,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['md:loss:remove']"
           >删除</el-button
         >
       </el-col>
@@ -69,6 +72,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:loss:edit']"
             >修改</el-button
           >
           <el-button
@@ -76,6 +80,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-hasPermi="['md:loss:remove']"
             >删除</el-button
           >
         </template>

src/views/mes/md/product/components/faceColor.vue

@@ -9,6 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['mes:md:faceColor:add']"
         >新增</el-button>
         <ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect>
       </el-col>
@@ -20,6 +21,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['mes:md:faceColor:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -46,12 +48,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:md:faceColor:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:md:faceColor:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/mes/md/product/components/factory.vue

@@ -9,6 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['md:factory:add']"
           >新增</el-button
         >
         <FactorySelect ref="FactorySelectRef" @onSelected="onFactorySelect" />
@@ -21,6 +22,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['md:factory:remove']"
           >删除</el-button
         >
       </el-col>
@@ -31,6 +33,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-hasPermi="['md:factory:export']"
           >导出</el-button
         >
       </el-col>
@@ -97,6 +100,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-hasPermi="['md:factory:remove']"
             >删除</el-button
           >
         </template>