解决查询字典之后label未反显问题

src/api/material/basic.js

@@ -350,6 +350,60 @@ const delMaterial = (data) => {
   })
 }
 
+// 删除利润中心信息 /dev-api/drp-admin/system/center/delete/{id}
+const delCenter = (id) => {
+  return request({
+    url: `/system/center/delete/${id}`,
+    method: 'get',
+    params: {}
+  })
+}
+
+// 删除库存信息 /dev-api/drp-admin/system/inventory/delete/{id}
+const delInventory = (id) => {
+  return request({
+    url: `/system/inventory/delete/${id}`,
+    method: 'get',
+    params: {}
+  })
+}
+
+// 删除成本信息 /dev-api/drp-admin/system/cost/delete/{id}
+const delCost = (id) => {
+  return request({
+    url: `/system/cost/delete/${id}`,
+    method: 'get',
+    params: {}
+  })
+}
+
+// 删除计划信息 /dev-api/drp-admin/system/plan/delete/{id}
+const delPlan = (id) => {
+  return request({
+    url: `/system/plan/delete/${id}`,
+    method: 'get',
+    params: {}
+  })
+}
+
+// 删除财物信息 /dev-api/drp-admin/system/finance/delete/{id}
+const delFinance = (id) => {
+  return request({
+    url: `/system/finance/delete/${id}`,
+    method: 'get',
+    params: {}
+  })
+}
+
+// 删除采购信息 /dev-api/drp-admin/system/purchase/delete/{id}
+const delPurchase = (id) => {
+  return request({
+    url: `/system/purchase/delete/${id}`,
+    method: 'get',
+    params: {}
+  })
+}
+
 
 export default {
   // 查询
@@ -394,4 +448,10 @@ export default {
 
   // 删除
   delMaterial,
+  delCenter,
+  delInventory,
+  delCost,
+  delPlan,
+  delFinance,
+  delPurchase,
 }

src/views/material/basicFile/details.vue

@@ -29,7 +29,7 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-                                                                                                                                    <el-button size="small" @click="handleQuery">查询</el-button> -->
+                                                                                                                                                                    <el-button size="small" @click="handleQuery">查询</el-button> -->
             <el-button size="small" @click="handleRefresh">刷新</el-button>
 
           </el-button-group>
@@ -49,7 +49,7 @@
                 <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
                 <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item>
               </el-dropdown-menu>
-                                                                                                                                                                                   </el-dropdown> -->
+                                                                                                                                                                                                                   </el-dropdown> -->
           </el-button-group>
         </el-col>
 
@@ -58,7 +58,7 @@
           <el-button-group>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
           </el-button-group>
-                                                                                                                            </el-col> -->
+                                                                                                                                                            </el-col> -->
 
         <!-- 导入导出 -->
       <!-- <el-col :span="1.5">
@@ -66,7 +66,7 @@
             <el-button size="small" @click="handleImport">批量导入</el-button>
             <el-button size="small" @click="handleExport">批量导出</el-button>
           </el-button-group>
-                                                                                                                              </el-col> -->
+                                                                                                                                                              </el-col> -->
 
       </el-row>
 
@@ -112,7 +112,7 @@
           <!-- 附件管理 -->
         <!-- <el-button-group>
             <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button>
-                                                                                                                            </el-button-group> -->
+                                                                                                                                                            </el-button-group> -->
 
           <!-- 切换 -->
         <!-- <el-button-group>
@@ -124,7 +124,7 @@
               @click="handleChangePage('next')" />
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
               @click="handleChangePage('end')" />
-                                                                                                                            </el-button-group> -->
+                                                                                                                                                            </el-button-group> -->
         </el-col>
       </el-row>
 
@@ -170,16 +170,24 @@
                         <el-form-item v-else-if="f.attribute == 'select'" :label="f.name"
                           :id="(updateButtonGroup && f.apiUrl) ? 'selected' : ''">
 
-                          <el-select v-model="basicData.value[`${f.prop}Name`]" :placeholder="f.name"
+                          <el-select v-if="f.apiUrl" v-model="basicData.value[`${f.prop}Name`]" :placeholder="f.name"
                             :key="basicData.value[f.prop]" :disabled="!(updateButtonGroup && f.edit)"
                             @focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
-                            <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictCode" :label="d.dictLabel"
+                          <!-- <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictCode" :label="d.dictLabel"
                               :value="d.dictCode">
-                            </el-option>
+                                      </el-option> -->
 
                             <div slot="empty"></div>
                           </el-select>
 
+                          <el-select v-else v-model="basicData.value[f.prop]" :placeholder="f.name"
+                            :key="basicData.value[f.prop]" :disabled="!(updateButtonGroup && f.edit)"
+                            @focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
+                            <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictCode" :label="d.dictLabel"
+                              :value="d.dictCode">
+                            </el-option>
+                          </el-select>
+
                         </el-form-item>
 
                         <el-form-item v-else-if="f.attribute == 'image'" :label="f.name">
@@ -236,7 +244,20 @@
                             <!-- 下拉框 -->
                             <el-form-item v-else-if="m.attribute == 'select'" :label="m.name">
 
-                              <el-select v-model="medcineData.value[`${m.prop}Name`]" :placeholder="m.name"
+                              <!-- 参照弹窗 -->
+                              <el-select v-if="m.apiUrl" v-model="medcineData.value[`${m.prop}Name`]"
+                                :placeholder="m.name" :key="medcineData.value[m.prop]" :disabled="!updateButtonGroup"
+                                @focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
+
+                              <!-- <el-option v-if="m.dictId" v-for="d in m.dictValue" :key="d.dictValue"
+                                  :label="d.dictLabel" :value="d.dictValue">
+                                            </el-option> -->
+
+                                <div slot="empty"></div>
+                              </el-select>
+
+                              <!-- 下拉选择 -->
+                              <el-select v-else v-model="medcineData.value[m.prop]" :placeholder="m.name"
                                 :key="medcineData.value[m.prop]" :disabled="!updateButtonGroup"
                                 @focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
 
@@ -244,7 +265,6 @@
                                   :label="d.dictLabel" :value="d.dictValue">
                                 </el-option>
 
-                                <div slot="empty"></div>
                               </el-select>
                             </el-form-item>
 
@@ -352,13 +372,23 @@
               v-model="scope.row[mt.prop]" />
 
             <!-- 下拉框 / 参照弹窗 -->
-            <el-select size="small" v-else-if="mt.attribute == 'select'" :disabled="!(materialType.isEdit && mt.edit)"
-              v-model="scope.row[`${mt.prop}Label`]" :key="scope.row[mt.prop]" :placeholder="mt.name"
+            <el-select size="small" v-else-if="mt.attribute == 'select' && mt.apiUrl"
+              :disabled="!(materialType.isEdit && mt.edit)" v-model="scope.row[`${mt.prop}Label`]"
+              :key="scope.row[mt.prop]" :placeholder="mt.name"
+              @focus="mt.apiUrl && handleQueryMore(mt, '', { name: 'materialType', prop: mt.prop })">
+            <!-- <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
+                :value="d.dictValue">
+                    </el-option> -->
+              <div slot="empty"></div>
+            </el-select>
+
+            <el-select size="small" v-else-if="mt.attribute == 'select' && mt.dictId" :disabled="!(materialType.isEdit && mt.edit)"
+              v-model="scope.row[mt.prop]" :key="scope.row[mt.prop]" :placeholder="mt.name"
               @focus="mt.apiUrl && handleQueryMore(mt, '', { name: 'materialType', prop: mt.prop })">
               <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
                 :value="d.dictValue">
               </el-option>
-              <div slot="empty"></div>
+              <!-- <div slot="empty"></div> -->
             </el-select>
 
             <!-- 其他类型 -->
@@ -381,6 +411,7 @@
       </span>
     </el-dialog>
 
+
     <!-- 其他页签的操作 -->
     <el-dialog :title="otherDeatils.title" :visible.sync="otherDeatils.show" show-close width="70%"
       :before-close="handleCloseOtherDetails" :close-on-press-escape="false" :close-on-click-modal="false"
@@ -410,7 +441,7 @@
           <el-collapse-item title="物料基本信息" name="basic">
             <el-form :inline="true" label-position="right" :model="basicData.value">
             <!-- <el-form-item label="所属组织">
-                    <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
+                                                    <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
               <el-form-item label="物料编码">
                 <el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
               </el-form-item>
@@ -421,7 +452,7 @@
                 <el-input v-model="basicData.value.enName" size="small" readonly placeholder="英文名称"></el-input>
               </el-form-item>
             <!-- <el-form-item label="版本号">
-                  <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
+                                                  <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
 
             </el-form>
           </el-collapse-item>
@@ -1238,7 +1269,7 @@ export default {
     },
     // 其他标签详情弹窗-删除
     handleOtherDel() {
-
+      console.log(`${this.activeMainTab}其他标签详情弹窗-删除`, this.mainMsg.checkedList);
     },
     // 修改
     handleBasicEdit() {
@@ -1602,6 +1633,46 @@ export default {
     },
 
 
+    // 删除利润中心信息
+    handledDelCenter(ids) {
+      console.log('删除利润中心信息');
+      materialApi.delCenter({ ids }).then(res => {
+      })
+    },
+    // 删除库存信息
+    handleDelInventory(ids) {
+      console.log('删除库存信息');
+      materialApi.delInventory({ ids }).then(res => {
+      })
+    },
+    // 删除成本信息
+    handleDelCost(ids) {
+      console.log('删除成本信息');
+      materialApi.delCost({ ids }).then(res => {
+      })
+    },
+    // 删除计划信息
+    handleDelPlan(ids) {
+      console.log('删除计划信息');
+      materialApi.delPlan({ ids }).then(res => {
+
+      })
+    },
+    // 删除财物信息
+    handleDelFinance(ids) {
+      console.log('删除财物信息');
+      materialApi.delFinance({ ids }).then(res => {
+
+      })
+    },
+    // 删除采购信息
+    handledelPurchase(ids) {
+      console.log('删除采购信息');
+      materialApi.delPurchase({ ids }).then(res => {
+
+      });
+    },
+
 
     // 保存物料以及相关页签
     handleSaveMaterial(cb) {

src/views/material/basicFile/index.vue

@@ -421,7 +421,7 @@ export default {
 
       .el-table__body-wrapper {
         // height: calc(100% - 150px);
-        height: calc(100% - 150px);
+        height: calc(100% - 70px);
         overflow-y: auto !important;
         overflow-x: auto !important;
         // .el-table__body {

vue.config.js

@@ -36,7 +36,6 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://172.16.100.107:8080/ruoyi-admin`, //生产
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
         target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://172.16.63.202:8000/drp-admin`, // 谁的本地