Merge commit '064c69ceffb8b5cd0fbf3e334391576d1118a246'

acs/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue

@@ -73,6 +73,21 @@
           <el-form-item :label="$t('dict.other.Parameter3')" prop="para3">
             <el-input v-model="form.para3" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="所属车间" prop="dict_type">
+            <el-select
+              v-model="form.dict_type"
+              size="mini"
+              placeholder="位置"
+              class="filter-item"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in dict.area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
@@ -97,6 +112,7 @@
         <el-table-column prop="para1" :label="$t('dict.other.Parameter1')" align="center" :min-width="flexWidth('para1',crud.data,$t('dict.other.Parameter1'))" />
         <el-table-column prop="para2" :label="$t('dict.other.Parameter2')" align="center" :min-width="flexWidth('para2',crud.data,$t('dict.other.Parameter2'))" />
         <el-table-column prop="para3" :label="$t('dict.other.Parameter3')" align="center" :min-width="flexWidth('para3',crud.data,$t('dict.other.Parameter3'))" />
+        <el-table-column prop="dict_type" label="所属车间" align="center" width="65" />
         <el-table-column
           v-permission="['admin','dict:edit','dict:del']"
           :label="$t('dict.table_value.Operate')"
@@ -126,12 +142,13 @@ import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
 import i18n from '@/i18n'
 
-const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dictType: null, para1: null,
+const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dict_type: null, para1: null,
   para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null,
   updateTime: null, zh_label: null, in_label: null, en_label: null }
 
 export default {
   components: { pagination, rrOperation, udOperation },
+  dicts: ['area'],
   cruds() {
     return [
       CRUD({