物料基本信息列表中添加停用启用操作按钮

src/api/material/basic.js

@@ -250,6 +250,16 @@ const saveMaterial = (data) => {
   })
 }
 
+// 修改列表中的停用/启用
+const updateEnableMaterial = (data) => {
+  // enableMaterial
+  return request({
+    url: `/system/material/enableMaterial `,
+    method: 'post',
+    data,
+  })
+}
+
 // 保存物料以及医药行业接口 /dev-api/drp-admin/system/material/insertMaterialInfo
 const insertMaterialInfo = (data) => {
   return request({
@@ -434,6 +444,7 @@ export default {
   materialEdit,
   medcineEdit,
   saveMaterial,
+  updateEnableMaterial,
   insertMaterialInfo,
   medcineitemBatchSave,
   financeEdit,

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>
@@ -47,8 +47,7 @@
               启用
               <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-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item></el-dropdown-menu></el-dropdown> -->
           </el-button-group>
         </el-col>
 
@@ -57,7 +56,7 @@
           <el-button-group>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                          </el-col> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      </el-col> -->
 
         <!-- 导入导出 -->
       <!-- <el-col :span="1.5">
@@ -65,7 +64,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>
 
@@ -110,8 +109,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>
@@ -122,8 +120,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>
 
@@ -284,7 +281,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>
@@ -437,7 +434,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> -->
 
             <!-- 其他类型 -->
 
@@ -489,7 +486,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>
@@ -500,7 +497,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>
@@ -1779,7 +1776,7 @@ export default {
         // 物料类别
         console.log('确认时选择的数据', this.MoreDataDialog.value);
 
-        this.materialType.value = this.materialType.value.map(m => { 
+        this.materialType.value = this.materialType.value.map(m => {
           if ((m.id && m.id != '' && m.id == _this.MoreDataDialog.target.prop['id']) ||
             (m.insertId && m.insertId == _this.MoreDataDialog.target.prop['insertId'])
           ) {
@@ -1955,6 +1952,7 @@ export default {
       })
 
     },
+
   },
   created() {
 

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>
@@ -35,25 +35,30 @@
       </el-col>
 
       <!-- 启用 -->
-    <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button-group>
-          <el-dropdown :disabled="checkedList.length != 1 && handleJudgeIsUsing" split-button size="small"
+          <el-button size="small" @click="handleIsInvoke" :disabled="checkedList.length != 1"
+            v-hasPermi="['system:material:add']">
+            <!-- 0：启用  2：停用 -->
+            {{ handleJudgeIsUsing() ? '停用' : '启用' }}
+          </el-button>
+        <!-- <el-dropdown :disabled="checkedList.length != 1 && handleJudgeIsUsing" 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-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">
@@ -191,8 +196,7 @@ export default {
   methods: {
     // 判读是否启用
     handleJudgeIsUsing() {
-
-      return this.checkedList[0] && this.checkedList[0].isEnable == '已启用';
+      return this.checkedList.length == 1 && this.checkedList[0].isEnable == '已启用';
     },
     // 改变分页大小
     handleSizeChange(e) {
@@ -284,9 +288,20 @@ export default {
         type
       }
     },
-    // 启用
-    handleIsInvoke(e) {
-      console.log('启用', e);
+    // 启用/停用
+    handleIsInvoke() {
+      // true   当前状态为启用，需要改为停用
+      // 0：启用  2：停用
+      let param = {
+        isEnable: this.handleJudgeIsUsing() ? '2' : '0',
+        id: this.checkedList[0].id
+      };
+      console.log(param, '启用/停用param');
+      materialApi.updateEnableMaterial(param).then(res => {
+        console.log(res, '启用/停用');
+        if (res.code == 200) this.handleRefresh();
+      })
+
     },
     isInvoke(val) {
       return val;

vue.config.js

@@ -36,12 +36,12 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://test-sy.derom.com/drp-admin`, //测试
+        // target: `http://test-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`, //笑寒本地
         // 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: {