配置中心功能新增

src/api/common.js

@@ -1,84 +1,100 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 字典列表
 export function getDictList(params) {
   return request({
-    url: '/common/dict/list',
-    method: 'get',
-    params
-  })
+    url: "/common/dict/list",
+    method: "get",
+    params,
+  });
 }
 
 // 修改字典列表
 export function editDictList(params) {
   return request({
-    url: '/common/dict/update',
-    method: 'post',
-    data: params
-  })
+    url: "/common/dict/update",
+    method: "post",
+    data: params,
+  });
+}
+// 删除字典
+export function deleDictList(params) {
+  return request({
+    url: "/common/dict/del",
+    method: "post",
+    params,
+  });
+}
+// 添加字典
+export function addDictList(params) {
+  return request({
+    url: "/common/dict/add",
+    method: "post",
+    data: params,
+  });
 }
 
 // 销售类型列表
 export function getTypeList(params) {
   return request({
-    url: '/sale/type/list',
-    method: 'get',
-    params
-  })
+    url: "/sale/type/list",
+    method: "get",
+    params,
+  });
 }
 
 // 获取oss配置
 export function getOssConfig(params) {
   return request({
-    url: '/common/oss/config',
-    method: 'get',
-    params
-  })
+    url: "/common/oss/config",
+    method: "get",
+    params,
+  });
 }
 
 // 获取附件地址
 export function getFileUrl(params) {
   return request({
-    url: '/common/file/get',
-    method: 'get',
-    params
-  })
+    url: "/common/file/get",
+    method: "get",
+    params,
+  });
 }
 
 // 获取产品小类列表
 export function getSmallList(params) {
   return request({
-    url: '/product-category/sub-list',
-    method: 'get',
-    params
-  })
+    url: "/product-category/sub-list",
+    method: "get",
+    params,
+  });
 }
 
 // 获取经销商列表
 export function getDealerList(params) {
   return request({
-    url: '/customer/list',
-    method: 'get',
-    params
-  })
+    url: "/customer/list",
+    method: "get",
+    params,
+  });
 }
 
 // 获取存货类别列表
 export function getCategoryList(params) {
   return request({
-    url: '/k3/category/list',
-    method: 'get',
-    params
-  })
+    url: "/k3/category/list",
+    method: "get",
+    params,
+  });
 }
 
 // 联查单据
 export function checkOrder(params) {
   return request({
-    url: '/invoice/listInvoiceRetreat',
-    method: 'get',
-    params
-  })
+    url: "/invoice/listInvoiceRetreat",
+    method: "get",
+    params,
+  });
 }
 
 // 获取业务员列表
@@ -88,4 +104,4 @@ export function getSalesmanList(params) {
     method: "get",
     params,
   });
-}
+}

src/views/engin_deposit/refund_list.vue

@@ -148,7 +148,7 @@
                 <span>{{scope.row.refFactoryNo}}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column align="left" label="产品编码" prop="customerName" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="产品编码" prop="customerName" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
@@ -171,7 +171,7 @@
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
               </template>
-            </el-table-column> -->
+            </el-table-column>
             <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed }}

src/views/setting/other.vue

@@ -85,39 +85,120 @@
 
     <div v-show="formType === 'sixth'">
       <div style="margin: 40px 0 30px;">
+        <el-button type="primary" size="mini" @click="addShowFn">新增</el-button>
         <!-- 列表 -->
         <div class="mymain-container">
           <div class="table">
-            <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+            <el-table v-loading="listLoading" :data="sixthForm" element-loading-text="Loading" border fit highlight-current-row stripe>
 
-              <el-table-column align="left" label="名称" prop="takerName" min-width="160" show-overflow-tooltip></el-table-column>
-              <el-table-column align="left" label="备注" prop="identity" min-width="170" show-overflow-tooltip></el-table-column>
+              <el-table-column align="left" label="名称" prop="dictCode" min-width="160" show-overflow-tooltip></el-table-column>
+              <el-table-column align="left" label="备注" prop="remark" min-width="170" show-overflow-tooltip></el-table-column>
 
-              <el-table-column align="center" label="操作" prop="caozuo" min-width="160" show-overflow-tooltip fixed="right">
-                <!-- <template slot-scope="scope">
-                  <el-button type="text" class="textColor">编辑</el-button>
-                </template> -->
+              <el-table-column align="center" label="操作" prop="" min-width="160" show-overflow-tooltip fixed="right">
+                <template slot-scope="scope">
+                  <el-button type="text" class="textColor" @click="editFn(scope.row)">编辑</el-button>
+                  <el-popconfirm @onConfirm="deleFn(scope.row.sysDictId)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
+                    <el-button type="text" class="textColor" slot="reference">删除</el-button>
+                  </el-popconfirm>
+                </template>
               </el-table-column>
             </el-table>
           </div>
-          <!-- 分页 -->
-          <div class="fr">
-            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
-            </el-pagination>
+        </div>
+      </div>
+
+    </div>
+    <div v-show="formType === 'seventh'">
+      <div style="margin: 40px 0 30px;">
+        <el-button type="primary" size="mini" @click="addShowFn">新增</el-button>
+        <!-- 列表 -->
+        <div class="mymain-container">
+          <div class="table">
+            <el-table v-loading="listLoading" :data="seventhForm" element-loading-text="Loading" border fit highlight-current-row stripe>
+
+              <el-table-column align="left" label="名称" prop="dictCode" min-width="160" show-overflow-tooltip></el-table-column>
+              <el-table-column align="left" label="备注" prop="remark" min-width="170" show-overflow-tooltip></el-table-column>
+
+              <el-table-column align="center" label="操作" prop="" min-width="160" show-overflow-tooltip fixed="right">
+                <template slot-scope="scope">
+                  <el-button type="text" class="textColor" @click="editFn(scope.row)">编辑</el-button>
+                  <el-popconfirm @onConfirm="deleFn(scope.row.sysDictId)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
+                    <el-button type="text" class="textColor" slot="reference">删除</el-button>
+                  </el-popconfirm>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+
+    </div>
+    <div v-show="formType === 'eigth'">
+      <div style="margin: 40px 0 30px;">
+        <el-button type="primary" size="mini" @click="addShowFn">新增</el-button>
+        <!-- 列表 -->
+        <div class="mymain-container">
+          <div class="table">
+            <el-table v-loading="listLoading" :data="eigthForm" element-loading-text="Loading" border fit highlight-current-row stripe>
+
+              <el-table-column align="left" label="名称" prop="dictCode" min-width="160" show-overflow-tooltip></el-table-column>
+              <el-table-column align="left" label="备注" prop="remark" min-width="170" show-overflow-tooltip></el-table-column>
+
+              <el-table-column align="center" label="操作" prop="" min-width="160" show-overflow-tooltip fixed="right">
+                <template slot-scope="scope">
+                  <el-button type="text" class="textColor" @click="editFn(scope.row)">编辑</el-button>
+                  <el-popconfirm @onConfirm="deleFn(scope.row.sysDictId)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
+                    <el-button type="text" class="textColor" slot="reference">删除</el-button>
+                  </el-popconfirm>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </div>
       </div>
-      <el-button type="primary" size="small">确 定</el-button>
+
     </div>
+
+    <!-- //弹窗 -->
+    <el-dialog :title="title" :visible.sync="dialogForm" width="30%" :show-close="false" :close-on-click-modal="false">
+      <el-form size="mini" ref="addForm" :rules="rules" :model="addForm" label-width="120px">
+        <el-form-item label="名称" prop="dictCode">
+          <el-input v-model="addForm.dictCode"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="addForm.remark"></el-input>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="cancelFn">取 消</el-button>
+        <el-button size="mini" type="primary" @click="addDataFn">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getDictList, editDictList } from "@/api/common";
+import {
+  getDictList,
+  editDictList,
+  addDictList,
+  deleDictList,
+} from "@/api/common";
 
 export default {
   data() {
     return {
+      listLoading: false, // 列表加载loading
+      rules: {
+        dictCode: [{ required: true, message: "请输入名称", trigger: "blur" }],
+      },
+      addForm: {
+        dictCode: "",
+        remark: "",
+      },
+      dialogForm: false,
+      title: "新增",
       formType: "first",
       firstForm: {
         input1: {},
@@ -139,12 +220,87 @@ export default {
       fifthForm: {
         input1: {},
       },
+      sixthForm: [],
+      seventhForm: [],
+      eigthForm: [],
     };
   },
   created() {
     this.getDetail("first");
   },
   methods: {
+    //删除
+    async deleFn(id) {
+      await deleDictList({ id: id });
+      this.$message.success("删除成功");
+      this.getDetail(this.formType);
+    },
+    //编辑
+    editFn(value) {
+      this.$nextTick(() => {
+        this.title = "编辑";
+        this.addForm.dictCode = value.dictCode;
+        this.addForm.remark = value.remark;
+        this.addForm.sysDictId = value.sysDictId;
+        this.addForm.dictType = value.dictType;
+      });
+
+      this.dialogForm = true;
+    },
+    //弹窗确定
+    async addDataFn() {
+      // console.log(this.addForm);
+
+      await this.$refs.addForm.validate();
+
+      if (this.addForm.sysDictId) {
+        //编辑
+        await editDictList([
+          {
+            ...this.addForm,
+          },
+        ]);
+        this.$message.success("编辑成功");
+      } else {
+        let type = "";
+        if (this.formType == "sixth") {
+          type = "MACHINE_TYPE";
+        } else if (this.formType == "seventh") {
+          type = "SIGN_TYPE";
+        } else {
+          type = "POWER_CATEGORY";
+        }
+        await addDictList({
+          ...this.addForm,
+          dictValue: this.addForm.dictCode,
+          dictType: type,
+        });
+        this.$message.success("新增成功");
+      }
+      this.getDetail(this.formType);
+
+      this.addForm = {
+        dictCode: "",
+        remark: "",
+      };
+      this.dialogForm = false;
+    },
+    //cancelFn 弹窗取消
+    async cancelFn() {
+      await this.$refs.addForm.resetFields();
+
+      this.addForm = {
+        dictCode: "",
+        remark: "",
+      };
+      this.dialogForm = false;
+      // this.addForm.dictCode ='';
+    },
+    //展示新增弹窗
+    addShowFn() {
+      this.title = "新增";
+      this.dialogForm = true;
+    },
     // 查询按钮权限
     checkBtnRole(value) {
       // let btnRole = this.$route.meta.roles;
@@ -166,8 +322,8 @@ export default {
         fourth: "STOCK_ORDER",
         fifth: "PRINT_PASSWORD",
         sixth: "MACHINE_TYPE",
-        seventh: "POWER_CATEGORY",
-        eigth: "SIGN_TYPE",
+        seventh: "SIGN_TYPE",
+        eigth: "POWER_CATEGORY",
       };
       getDictList({ sysDictEnum: MAP[type] }).then((res) => {
         let data = res.data.map((item) => {
@@ -186,6 +342,15 @@ export default {
           this[type + "Form"].input5 = data[4];
           this[type + "Form"].input6 = data[5];
         }
+        if (type == "sixth") {
+          this.sixthForm = res.data;
+        }
+        if (type == "seventh") {
+          this.seventhForm = res.data;
+        }
+        if (type == "eigth") {
+          this.eigthForm = res.data;
+        }
       });
     },