修改列表展示中多选框数值展示

src/api/material/basic.js

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

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>
 
@@ -219,7 +219,13 @@
                   <el-table-column type="selection" width="55" />
                   <el-table-column type="index" label="序号" width="55" align="center" />
                   <el-table-column v-for="m in  mainMsg.form" v-if="m.show" :label="m.name" align="center"
-                    :prop="m.attribute == 'select' ? `${m.prop}Name` : m.prop" show-overflow-tooltip />
+                    :prop="m.attribute == 'select' ? `${m.prop}Name` : m.prop" show-overflow-tooltip>
+                    {{ m.attribute == 'select' ? scope.row[`${m.prop}Name`] :
+                          (m.attribute == 'checkbox' ?
+                            (scope.row[m.prop] == '0' ? '是' : '否')
+                            : scope.row[m.prop])
+                        }} 
+                  </el-table-column>
                 </el-table>
 
               </div>
@@ -258,7 +264,7 @@
                                 @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> -->
+                                                                                                                        :label="d.dictLabel" :value="d.dictValue"></el-option> -->
 
                                 <div slot="empty"></div>
                               </el-select>
@@ -303,7 +309,13 @@
                       class="material-table">
                       <el-table-column type="index" label="序号" width="55" align="center" />
                       <el-table-column v-for="v in  unitDetails.form" v-if="v.show" :label="v.name" align="center"
-                        :prop="v.attribute == 'select' ? `${v.prop}Name` : v.prop" show-overflow-tooltip />
+                        :prop="v.attribute == 'select' ? `${v.prop}Name` : v.prop" show-overflow-tooltip>
+                        {{ v.attribute == 'select' ? scope.row[`${v.prop}Name`] :
+                          (v.attribute == 'checkbox' ?
+                            (scope.row[v.prop] == '0' ? '是' : '否')
+                            : scope.row[v.prop])
+                        }}
+                      </el-table-column>
                     </el-table>
 
                     <!-- 辅助属性 -->
@@ -394,7 +406,7 @@
               <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
                 :value="d.dictValue">
               </el-option>
-                                                                                                                                  </el-select> -->
+                                                                                                                                          </el-select> -->
 
             <!-- 其他类型 -->
 
@@ -446,7 +458,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>
@@ -457,7 +469,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>
@@ -1322,7 +1334,42 @@ export default {
     },
     // 其他标签详情弹窗-删除
     handleOtherDel() {
-      console.log(`${this.activeMainTab}其他标签详情弹窗-删除`, this.mainMsg.checkedList);
+      let ids = this.mainMsg.checkedList.map(i => i.id);
+      console.log(`${this.activeMainTab}其他标签详情弹窗-删除---id合集`, ids);
+      if (ids.length) {
+        switch (this.activeMainTab) {
+          // 财物信息
+          case 'material_finance':
+            this.handleDelFinance(ids);
+            break;
+          // 利润中心信息
+          case 'profit_center':
+            this.handledDelCenter(ids);
+            break;
+          // 采购信息
+          case 'material_purchase':
+            this.handledelPurchase(ids);
+            break;
+          // 库存信息
+          case 'material_inventory':
+            this.handleDelInventory(ids);
+            break;
+          // 计划信息
+          case 'material_plan':
+            this.handleDelPlan(ids);
+            break;
+          // 成本信息
+          case 'material_cost':
+            this.handleDelCost(ids);
+          default:
+            break;
+        }
+      } else {
+        this.$message({
+          message: '请选择需要删除的数据！',
+          type: 'warning'
+        });
+      }
     },
     // 修改
     handleBasicEdit() {
@@ -1715,39 +1762,39 @@ export default {
     // 删除利润中心信息
     handledDelCenter(ids) {
       console.log('删除利润中心信息');
-      materialApi.delCenter({ ids }).then(res => {
+      materialApi.delCenter(ids).then(res => {
       })
     },
     // 删除库存信息
     handleDelInventory(ids) {
       console.log('删除库存信息');
-      materialApi.delInventory({ ids }).then(res => {
+      materialApi.delInventory(ids).then(res => {
       })
     },
     // 删除成本信息
     handleDelCost(ids) {
       console.log('删除成本信息');
-      materialApi.delCost({ ids }).then(res => {
+      materialApi.delCost(ids).then(res => {
       })
     },
     // 删除计划信息
     handleDelPlan(ids) {
       console.log('删除计划信息');
-      materialApi.delPlan({ ids }).then(res => {
+      materialApi.delPlan(ids).then(res => {
 
       })
     },
     // 删除财物信息
     handleDelFinance(ids) {
       console.log('删除财物信息');
-      materialApi.delFinance({ ids }).then(res => {
+      materialApi.delFinance(ids).then(res => {
 
       })
     },
     // 删除采购信息
     handledelPurchase(ids) {
       console.log('删除采购信息');
-      materialApi.delPurchase({ ids }).then(res => {
+      materialApi.delPurchase(ids).then(res => {
 
       });
     },

src/views/material/basicFile/index.vue

@@ -26,7 +26,7 @@
               <el-dropdown-item :command="filterCondition('stop')">显示停用</el-dropdown-item>
               <el-dropdown-item :command="filterCondition('allot')">显示已分配</el-dropdown-item>
             </el-dropdown-menu>
-                                                            </el-dropdown> -->
+                                                                    </el-dropdown> -->
 
           <!-- <el-button size="small" @click="handleQuery">查询</el-button> -->
           <el-button size="small" @click="handleRefresh">刷新</el-button>
@@ -45,14 +45,14 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-button-group>
-                                                        </el-col> -->
+                                                                </el-col> -->
 
       <!-- 申请单查询 -->
     <!-- <el-col :span="1.5">
         <el-button-group>
           <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
         </el-button-group>
-                                                        </el-col> -->
+                                                                </el-col> -->
 
       <!-- 导入导出 -->
       <el-col :span="1.5">
@@ -85,7 +85,16 @@
         <el-table-column type="selection" width="20" />
         <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column width="150" v-for="h in  tableHeader" v-if="h.show" :label="h.name" align="center"
-          :prop="h.attribute == 'select' ? `${h.prop}Name` : h.prop" show-overflow-tooltip />
+          show-overflow-tooltip>
+          <!-- :prop="h.attribute == 'select' ? `${h.prop}Name` : h.prop" -->
+          <template slot-scope="scope">
+            {{ h.attribute == 'select' ? scope.row[`${h.prop}Name`] :
+              (h.attribute == 'checkbox' ?
+                (scope.row[h.prop] == '0' ? '是' : '否')
+                : scope.row[h.prop])
+            }}
+          </template>
+        </el-table-column>
       </el-table>
 
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"

vue.config.js

@@ -41,7 +41,7 @@ module.exports = {
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
-        target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
+        // target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
         changeOrigin: true,
         pathRewrite: {