新增维护版本

src/views/material/basicFile/details.vue

@@ -4,7 +4,23 @@
     <!-- 操作栏 -->
     <!-- 基本信息栏 -->
     <div v-if="activeMainTab == 'material'">
-      <el-row :gutter="10" class="mb10" v-if="!updateButtonGroup">
+
+      <!-- 基本信息修改状态下—— 保存、保存新增、更新导入、取消 -->
+      <el-row :gutter="10" class="mb10" v-if="updateButtonGroup || maintainNewVersion">
+        <el-col :span="1.5">
+          <el-button-group>
+            <el-button size="small" @click="handleSave" v-hasPermi="['system:material:add']">保存</el-button>
+          </el-button-group>
+        </el-col>
+
+        <el-col :span="1.5">
+          <el-button-group>
+            <el-button size="small" @click="handleCancel">取消</el-button>
+          </el-button-group>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="10" class="mb10" v-else>
         <!-- 新增、修改、删除、复制 -->
         <el-col :span="1.5">
           <el-button-group>
@@ -19,17 +35,6 @@
         <el-col :span="1.5">
           <el-button-group>
 
-          <!-- <el-dropdown size="small" @command="handleFilter">
-              <el-button size="small">
-                过滤<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="filterCondition('stop')">显示停用</el-dropdown-item>
-                <el-dropdown-item :command="filterCondition('allot')">显示已分配</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              <el-button size="small" @click="handleQuery">查询</el-button> -->
             <el-button size="small" @click="handleRefresh">刷新</el-button>
 
           </el-button-group>
@@ -43,47 +48,19 @@
               <!-- 0：启用  2：停用 -->
               {{ basicData.value.isEnable == '已启用' ? '停用' : '启用' }}
             </el-button>
-          <!-- <el-dropdown split-button size="small" @click="handleIsInvoke(true)" @command="handleIsInvoke">
-              启用
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
-                                                                                                                            <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item></el-dropdown-menu></el-dropdown> -->
           </el-button-group>
         </el-col>
 
-        <!-- 申请单查询 -->
+        <!-- 维护新版本 -->
       <!-- <el-col :span="1.5">
           <el-button-group>
-            <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
+            <el-button size="small" @click="handleNewVersion">维护新版本</el-button>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      </el-col> -->
-
-        <!-- 导入导出 -->
-      <!-- <el-col :span="1.5">
-          <el-button-group>
-            <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>
 
-      <!-- 基本信息修改状态下—— 保存、保存新增、更新导入、取消 -->
-      <el-row :gutter="10" class="mb10" v-else>
-        <el-col :span="1.5">
-          <el-button-group>
-            <el-button size="small" @click="handleSave" v-hasPermi="['system:material:add']">保存</el-button>
-            <!-- <el-button size="small" @click="handleSaveAdd" :disabled="true">保存新增</el-button> -->
-            <!-- <el-button size="small" @click="handleUpdateImport">更新导入</el-button> -->
-          </el-button-group>
-        </el-col>
 
-        <el-col :span="1.5">
-          <el-button-group>
-            <el-button size="small" @click="handleCancel">取消</el-button>
-          </el-button-group>
-        </el-col>
-      </el-row>
     </div>
 
     <!-- 其他标签页操作  修改、删除 -->
@@ -109,7 +86,7 @@
         <el-col :span="6" style="text-align: right;">
           <!-- 附件管理 -->
         <!-- <el-button-group>
-                                  <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
+                                                              <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
 
           <!-- 切换 -->
         <!-- <el-button-group>
@@ -120,7 +97,7 @@
             <el-button size="small" icon="el-icon-arrow-right" :disabled="!handleBasicEdit"
               @click="handleChangePage('next')" />
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
-                                @click="handleChangePage('end')" /></el-button-group> -->
+                                                            @click="handleChangePage('end')" /></el-button-group> -->
         </el-col>
       </el-row>
 
@@ -430,7 +407,7 @@
               :disabled="!(materialType.isEdit && mt.edit)" v-model="scope.row[mt.prop]" :key="scope.row[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></el-select> -->
+                                                                          </el-option></el-select> -->
 
             <!-- 其他类型 -->
             <el-input v-else size="small" v-model="scope.row[mt.prop]" :readonly="!(materialType.isEdit && mt.edit)" />
@@ -631,6 +608,8 @@ export default {
     return {
       count: 1,
       loading: false,
+      // 维护新版本
+      maintainNewVersion: false,
       // 详情固定标签页
       detailsTabs,
       defaultProps: {
@@ -1481,13 +1460,6 @@ export default {
     // 启用
     handleIsInvoke(e) {
       console.log('启用', this.basicData.value.isEnable);
-      // if (this.basicData.value.isEnable == '已启用') {
-      //   this.basicData.value.isEnable = '2';
-      // } else {
-      //   // this.basicData.isEnable 为空或者为2
-      //   this.basicData.value.isEnable = '0';
-      // }
-      // this.handleSave();
 
       let param = {
         isEnable: this.basicData.value.isEnable == '已启用' ? '2' : '0',
@@ -1499,22 +1471,11 @@ export default {
         if (res.code == 200) this.handleRefresh();
       })
     },
-    isInvoke(val) {
-      return val;
-    },
-    // 申请单查询
-    handleQueryForm() {
-      console.log('申请单查询');
-    },
-    // 批量导入
-    handleImport() {
-      console.log('批量导入');
-    },
-    // 批量导出
-    handleExport() {
-      console.log('批量导出');
+    // 维护新版本
+    handleNewVersion() {
+      console.log('维护新版本');
+      this.maintainNewVersion = true;
     },
-
     // 取消保存
     handleCancel() {
       console.log('取消保存');
@@ -1524,10 +1485,14 @@ export default {
     // 保存修改
     handleSave() {
       console.log('保存修改');
-      this.handleSaveMaterial(() => {
+      // 普通保存修改
+      this.updateButtonGroup && this.handleSaveMaterial(() => {
         this.updateButtonGroup = false;
         this.handleRefresh();
       });
+
+      // 维护新版本保存修改
+      this.maintainNewVersion && console.log('维护新版本保存修改');
     },
     // 物料类别列表选中
     handleSelectionType(list) {
@@ -1712,6 +1677,7 @@ export default {
 
       this.optionDialog.show = false;
 
+      // 取消基本信息修改
       if (this.updateButtonGroup) {
         this.updateButtonGroup = false;
         this.handleRest();
@@ -1723,10 +1689,18 @@ export default {
         })
       }
 
+      // 取消其他主页签详情弹窗修改
       if (this.otherDeatils.isEdit) {
         this.otherDeatils.isEdit = false;
         this.handleOtherRefresh();
       }
+
+      // 取消维护新版本修改
+      if (this.maintainNewVersion) {
+        console.log('取消维护新版本修改');
+        this.maintainNewVersion = false;
+        this.handleRefresh();
+      }
     },
     // 参照弹窗过滤
     handleFilterRefer() {

src/views/material/basicFile/index.vue

@@ -27,7 +27,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>
@@ -46,13 +46,6 @@
           </el-button-group>
         </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 :span="1.5">
           <el-button-group>
@@ -65,7 +58,7 @@
       </el-row>
 
       <!-- 查询条件 -->
-      <el-row :gutter="10" >
+      <el-row :gutter="10">
         <el-col :span="1.5">
           <el-form :inline="true" :model="queryForm" class="mb-query" @submit.native.prevent>
             <el-form-item label="物料编码">
@@ -101,8 +94,10 @@
 
     <!-- 主体列表 -->
     <el-card class="material-list" v-loading="loading">
-      <el-table :data="taskList" @cell-dblclick="handledbClick" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="30" />
+      <el-table :data="taskList" ref="materialTable" @cell-dblclick="handledbClick" :row-key="getRowKey"
+        @selection-change="handleSelectionChange">
+        <!-- :reserve-selection="true" -->
+        <el-table-column type="selection" width="30"  />
         <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"
           show-overflow-tooltip>
@@ -410,9 +405,15 @@ export default {
         path: `/material/basicFile/detail/${e.id}`,
       });
     },
+    // 绑定row-key
+    getRowKey(row) {
+      return row.id;
+    },
     // 选中数据改变
     handleSelectionChange(list) {
       this.checkedList = list;
+      // this.checkedList = Array.from(new Set([...this.checkedList, ...list]));
+      console.log(this.checkedList, '选中数据改变');
       this.$emit('headerOption', JSON.stringify({ checkedList: [...list] }))
     },
     // 获取物料列表信息
@@ -435,6 +436,15 @@ export default {
         let { code, data } = res;
         if (code == 200) {
           _this.taskList = data.tableBody.rows;
+          // console.log(_this.$refs.materialTable, ' _this.$refs.materialTable');
+          // _this.checkedList.forEach(c => {
+          //   _this.taskList.forEach(row => {
+          //     if (row.id == c.id) {
+          //       _this.$refs.materialTable.toggleRowSelection(row, true);
+          //     }
+          //   })
+          // })
+
           _this.total = data.tableBody.total;
 
         }

vue.config.js

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