优化

src/api/ledgerAssets/dryArea.js

@@ -31,4 +31,12 @@ export async function getList (data) {
     }
     return Promise.reject(new Error(res.data.message));
   }
-  
+  
+// 删除
+export async function removeItem (data) {
+  const res = await request.delete('/main/aridregion/delete', { data });
+  if (res.data.code == 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/login/index.js

@@ -36,10 +36,3 @@ export async function getCaptcha () {
 
 
 
-/* 根据编码管理 */
-export async function getCode(code) {
-  const res = await request.get(`/main/codemanage/getCode/${code}`);
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-}

src/views/ledgerAssets/dryArea/components/dryArea-list.vue

@@ -16,6 +16,22 @@
         <!-- 0空闲1占用 -->
         {{ row.status == 0 ? '空闲' : row.status == 1 ? '占用' : '' }}
       </template>
+
+
+      <template v-slot:action="{ row }">
+        <el-link type="primary" :underline="false" icon="el-icon-edit" @click="openEdit(row)">
+          编辑
+        </el-link>
+        <el-popconfirm class="ele-action" title="确定要删除此干燥区吗？" @confirm="remove(row)">
+          <template v-slot:reference>
+            <el-link type="danger" :underline="false" icon="el-icon-delete">
+              删除
+            </el-link>
+          </template>
+        </el-popconfirm>
+      </template>
+
+
     </ele-pro-table>
 
     <user-edit :visible.sync="showEdit" :data="current" @done="reload" ref="userEdit" />
@@ -25,7 +41,7 @@
 
 <script>
 import dryAreaSearch from './dryArea-search.vue';
-import { getList } from '@/api/ledgerAssets/dryArea';
+import { getList, removeItem } from '@/api/ledgerAssets/dryArea';
 import dictMixins from '@/mixins/dictMixins';
 import UserEdit from './user-edit.vue';
 
@@ -94,6 +110,13 @@ export default {
           slot: 'status',
         },
 
+        {
+          label: '操作',
+          prop: 'action',
+          slot: 'action',
+          action: 'action'
+        }
+
 
 
       ]
@@ -127,6 +150,20 @@ export default {
     },
 
 
+    /* 删除 */
+    remove(row) {
+      const loading = this.$loading({ lock: true });
+      removeItem([row.id])
+        .then((msg) => {
+          loading.close();
+          this.$message.success(msg);
+          this.reload();
+        })
+        .catch((e) => {
+          loading.close();
+        });
+    }
+
 
   },
   watch: {

src/views/ledgerAssets/dryArea/components/user-edit.vue

@@ -23,8 +23,6 @@
         </el-col>
 
 
-
-
         <el-col :span="12">
           <el-form-item label="状态:" prop="status">
             <DictSelection dictName="台账状态" clearable v-model="form.status">
@@ -32,7 +30,6 @@
           </el-form-item>
         </el-col>
 
-
         <el-col :span="12">
           <el-form-item label="规格:" prop="specification">
             <el-input clearable v-model="form.specification" placeholder="请输入规格" />
@@ -46,7 +43,6 @@
           </el-form-item>
         </el-col>
 
-
       </el-row>
     </el-form>
     <template v-slot:footer>
@@ -64,9 +60,10 @@
 <script>
 
 
-import { addUsers, putUsers } from '@/api/system/user';
-import CategoryDialog from '@/views/material/manage/components/CategoryDialog.vue'
 
+import CategoryDialog from '@/views/material/manage/components/CategoryDialog.vue'
+import { getCode } from '@/api/codeManagement/index.js';
+import { save, update } from '@/api/ledgerAssets/dryArea';
 
 export default {
   components: {
@@ -82,7 +79,8 @@ export default {
     const defaultForm = {
       code: '',
       name: '',
-      categoryLevelName: ''
+      categoryLevelName: '',
+      status: ''
     };
     return {
       defaultForm,
@@ -90,20 +88,23 @@ export default {
       form: { ...defaultForm },
       // 表单验证规则
       rules: {
-        loginName: [
-          { required: true, message: '请输入用户账号', trigger: 'blur' }
+        name: [
+          { required: true, message: '请输入干燥区名称', trigger: 'blur' }
+        ],
+        categoryLevelName: [
+          { required: true, message: '请选择分类', trigger: 'change' }
+        ],
+
+        status: [
+          { required: true, message: '请选择状态', trigger: 'change' }
         ],
-        roleId: [
-          { required: true, message: '请选择角色', trigger: 'change' }
+
+
+        region: [
+          { required: true, message: '请输入位置', trigger: 'blur' }
         ],
-        loginPwd: [
-          {
-            required: true,
-            pattern: /^[\S]{5,18}$/,
-            message: '密码必须为5-18位非空白字符',
-            trigger: 'blur'
-          }
-        ]
+
+
       },
       // 提交状态
       loading: false,
@@ -111,6 +112,8 @@ export default {
       isUpdate: false
     };
   },
+
+
   computed: {
     // 是否开启响应式布局
     styleResponsive() {
@@ -130,11 +133,8 @@ export default {
         }
         const data = {
           ...this.form
-          // roleId: this.form.roleIds.map((d) => {
-          //   return { roleId: d };
-          // })
         };
-        const saveOrUpdate = this.isUpdate ? putUsers : addUsers;
+        const saveOrUpdate = this.isUpdate ? update : save;
         saveOrUpdate(data)
           .then((msg) => {
             this.loading = false;
@@ -144,7 +144,7 @@ export default {
           })
           .catch((e) => {
             this.loading = false;
-            // this.$message.error(e.message);
+         
           });
       });
     },
@@ -164,6 +164,12 @@ export default {
     },
 
 
+    async _getCode() {
+      const code = await getCode('dryArea');
+      this.form.code = code;
+    },
+
+
   },
   watch: {
     visible(visible) {
@@ -177,6 +183,7 @@ export default {
           this.isUpdate = true;
         } else {
           this.isUpdate = false;
+          this._getCode();
         }
       } else {
         this.$refs.form.clearValidate();