Merge remote-tracking branch 'origin/master'

src/styles/element-ui.scss

@@ -114,6 +114,12 @@ body .el-table th.gutter{
 .el-form-item__label{
   padding: 0 10px 0 0;
 }
+.el-input-number.is-controls-right .el-input__inner{
+  padding-left: 10px!important;
+}
+.el-tree-node__content:hover{
+  background-color: #f3f3f3;
+}
 // 按钮默认颜色（红）
 .redBtn{
   border-color: #D20A10;
@@ -562,3 +568,7 @@ label {
 .el-dialog__headerbtn:hover .el-dialog__close{
   color: #D20A10;
 }
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: #D20A10;
+  border-color: #D20A10;
+}

src/views/productionInfo/ModelDetails.vue

@@ -876,7 +876,12 @@ export default {
     },
     // 配置物料选择框
     handleSelectionChangeMaterial(data) {
-      if (this.type !== '3') {
+      console.log(this.form.modelType, 'modelType')
+      console.log(this.type, 'type')
+      console.log(data, 'data')
+      if (this.type === '3' || (this.type === '2' && this.form.modelType === '2')) {
+        this.addMaterialList = data
+      } else {
         if (data.length === 0) {
           this.selectPartNum.forEach(item => {
             delete this.addMaterialMap[item.businessId]
@@ -891,8 +896,6 @@ export default {
         for (const key in this.addMaterialMap) {
           this.addMaterialList.push(this.addMaterialMap[key])
         }
-      } else {
-        this.addMaterialList = data
       }
     },
     // 禁用

src/views/system/dict/data.vue

@@ -134,6 +134,7 @@
             <div>Status</div>
           </template>
           <template slot-scope="scope">
+            <div style="text-align: center">
               <el-switch
                 v-model="scope.row.flag"
                 class="switchDisabledStyle"
@@ -141,6 +142,7 @@
                 active-value="1"
                 @click.native="changeStatus(scope.row)"
               />
+            </div>
           </template>
         </el-table-column>
         <el-table-column align="center" :show-overflow-tooltip="true" label="备注" prop="remarks">
@@ -171,7 +173,6 @@
               v-hasPermi="['sys:dictConfig:edit']"
               size="mini"
               type="success"
-              style="margin-left: 10px"
               @click="handleUpdate(scope.row)"
             >修改</el-link>
             <el-link
@@ -181,15 +182,15 @@
               style="margin-left: 10px"
               @click="handleDelete(scope.row)"
             >删除</el-link>
-<!--            <el-switch-->
-<!--              v-model="scope.row.status"-->
-<!--              v-hasPermi="['sys:dictConfig:toggle']"-->
-<!--              disabled-->
-<!--              class="switchDisabledStyle"-->
-<!--              active-value="0"-->
-<!--              inactive-value="1"-->
-<!--              @click.native="changeStatus(scope.row)"-->
-<!--            />-->
+            <!--            <el-switch-->
+            <!--              v-model="scope.row.status"-->
+            <!--              v-hasPermi="['sys:dictConfig:toggle']"-->
+            <!--              disabled-->
+            <!--              class="switchDisabledStyle"-->
+            <!--              active-value="0"-->
+            <!--              inactive-value="1"-->
+            <!--              @click.native="changeStatus(scope.row)"-->
+            <!--            />-->
           </template>
         </el-table-column>
       </el-table>
@@ -264,7 +265,7 @@
 
 <script>
 import { listData, getData, delData, addData, updateData, exportData, checkDictLabelUnique } from '@/api/system/dict/data'
-import { listType,listTypeAll, getType, updateType } from '@/api/system/dict/type'
+import { listType, listTypeAll, getType, updateType } from '@/api/system/dict/type'
 import dictCons from '@/utils/dictCons'
 
 export default {

src/views/system/dict/index.vue

@@ -3,7 +3,7 @@
     <div class="dictSearch">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto">
         <el-row>
-          <el-col :span="18">
+          <el-col :span="20">
             <el-form-item label="字典名称" prop="dictName">
               <div slot="label" class="labelClass">
                 <div>字典名称</div>
@@ -34,7 +34,7 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="状态" prop="flag">
+            <el-form-item label="状态" prop="flag" label-width="50px">
               <div slot="label" class="labelClass">
                 <div>状态</div>
                 <div>Status</div>
@@ -71,7 +71,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item style="float: right">
               <el-button class="redBtn" type="danger" size="small" @click="handleQuery">查询 Query</el-button>
               <el-button class="resetBtn" size="small" @click="resetQuery">重置 Reset</el-button>
@@ -148,7 +148,7 @@
               :to="'/dict/type/data/' + scope.row.businessId"
               class="link-type"
             >
-              <span :style="{color: $haveAuth('sys:dictConfig:list') ? '#20a0ff' : '#333333' }">{{ scope.row.dictType }}</span>
+              <span :style="{color: $haveAuth('sys:dictConfig:list') ? '#D20A10' : '#333333' }">{{ scope.row.dictType }}</span>
             </router-link>
             <div v-else>-</div>
           </template>
@@ -159,6 +159,7 @@
             <div>Status</div>
           </template>
           <template slot-scope="scope">
+            <div style="text-align: center">
               <el-switch
                 v-model="scope.row.flag"
                 class="switchDisabledStyle"
@@ -166,6 +167,7 @@
                 active-value="1"
                 @click.native="handleStatusChange(scope.row)"
               />
+            </div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="remarks" :show-overflow-tooltip="true">
@@ -196,7 +198,6 @@
               v-hasPermi="['sys:dict:edit']"
               size="mini"
               type="success"
-              style="margin-left: 10px"
               @click="handleUpdate(scope.row)"
             >修改</el-link>
             <el-link
@@ -219,7 +220,7 @@
     />
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :close-on-click-modal="false" class="dictDialog" title="字典信息" :visible.sync="open" width="60%" append-to-body @close="reset">
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="93px">
         <el-form-item class="labelHeight" label="字典名称" prop="dictName">
           <div slot="label" class="labelClassRequired">
             <div class="labelName">字典名称</div>
@@ -248,20 +249,20 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-<!--        <el-form-item class="labelHeight" label="父字典名称">-->
-<!--          <div slot="label" class="labelClass">-->
-<!--            <div class="labelName">父字典名称</div>-->
-<!--            <div class="labelName">Parent Dict Name</div>-->
-<!--          </div>-->
-<!--          <el-select v-model="form.parentId" style="width: 100%" clearable placeholder="请选择父字典类型" @change="getOptions">-->
-<!--            <el-option-->
-<!--              v-for="item in options"-->
-<!--              :key="item.businessId"-->
-<!--              :label="item.dictName"-->
-<!--              :value="item.businessId"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item class="labelHeight" label="父字典名称">-->
+        <!--          <div slot="label" class="labelClass">-->
+        <!--            <div class="labelName">父字典名称</div>-->
+        <!--            <div class="labelName">Parent Dict Name</div>-->
+        <!--          </div>-->
+        <!--          <el-select v-model="form.parentId" style="width: 100%" clearable placeholder="请选择父字典类型" @change="getOptions">-->
+        <!--            <el-option-->
+        <!--              v-for="item in options"-->
+        <!--              :key="item.businessId"-->
+        <!--              :label="item.dictName"-->
+        <!--              :value="item.businessId"-->
+        <!--            />-->
+        <!--          </el-select>-->
+        <!--        </el-form-item>-->
         <!--        <el-form-item v-show="form.parentId">-->
         <!--          <el-select v-model="form.dataId" style="width: 100%" clearable placeholder="请选择父字典类型" @visible-change="clearSelected">-->
         <!--            <el-option-->

src/views/system/role/index.vue

@@ -128,12 +128,14 @@
             <div>Status</div>
           </template>
           <template slot-scope="scope">
+            <div style="text-align: center">
               <el-switch
                 v-model="scope.row.flag"
                 active-value="1"
                 inactive-value="0"
                 @change="handleStatusChange(scope.row)"
               />
+            </div>
           </template>
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" align="center" prop="createTime">
@@ -155,7 +157,6 @@
               v-hasPermi="['sys:role:update']"
               size="mini"
               type="success"
-              style="margin-left: 10px"
               @click="handleUpdate(scope.row)"
             >修改</el-link>
             <!--            <el-button-->
@@ -184,7 +185,7 @@
 
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :close-on-click-modal="false" class="roleAddDialog" title="角色信息" :visible.sync="open" width="60%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item class="labelHeight" label="角色名称" prop="roleName">
           <div slot="label" class="labelClassRequired">
             <div class="labelName">角色名称</div>
@@ -812,9 +813,9 @@ export default {
       margin-left: 15px
     }
 
-    .el-switch {
-      margin-left: 15px;
-    }
+    //.el-switch {
+    //  margin-left: 15px;
+    //}
   }
   .roleAddDialog{
     .labelHeight{