From d3f1342f9d07e98deab8838f77787f55279d7c9c Mon Sep 17 00:00:00 2001
From: 15066119699 <bo.wu@finesys.com.cn>
Date: Thu, 6 Mar 2025 10:16:06 +0800
Subject: [PATCH] 1

---
 src/views/system/custom/index.vue   | 48 +++++++++++++++++------------
 src/views/system/provider/index.vue | 44 ++++++++++++++++----------
 2 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/src/views/system/custom/index.vue b/src/views/system/custom/index.vue
index cf5c8df..56e376a 100644
--- a/src/views/system/custom/index.vue
+++ b/src/views/system/custom/index.vue
@@ -67,7 +67,11 @@
       <el-table-column label="客户名称" align="center" prop="providerName" />
       <el-table-column label="电话" align="center" prop="providerContact" />
       <el-table-column label="地址" align="center" prop="providerAddress" />
-      <el-table-column label="状态" align="center" prop="providerStatus" />
+      <el-table-column label="状态" align="center" prop="providerStatus" >
+        <template slot-scope="scope">
+          {{scope.row.providerStatus=='1'?'禁用':'启用'}}
+        </template>
+      </el-table-column>
       <!--<el-table-column label="最近更新用户" align="center" prop="lastUpdateUser" />-->
       <!--<el-table-column label="最近更新时间" align="center" prop="lastUpdateTime" width="180">-->
         <!--<template slot-scope="scope">-->
@@ -105,25 +109,23 @@
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="客户编码" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入客户编码" />
+        </el-form-item>
         <el-form-item label="客户名称" prop="providerName">
           <el-input v-model="form.providerName" placeholder="请输入客户名称" />
         </el-form-item>
-        <el-form-item label="联系方式" prop="providerContact">
-          <el-input v-model="form.providerContact" placeholder="请输入联系方式" />
+        <el-form-item label="电话" prop="providerContact">
+          <el-input v-model="form.providerContact" placeholder="请输入电话" />
         </el-form-item>
         <el-form-item label="地址" prop="providerAddress">
           <el-input v-model="form.providerAddress" placeholder="请输入地址" />
         </el-form-item>
-        <el-form-item label="最近更新用户" prop="lastUpdateUser">
-          <el-input v-model="form.lastUpdateUser" placeholder="请输入最近更新用户" />
-        </el-form-item>
-        <el-form-item label="最近更新时间" prop="lastUpdateTime">
-          <el-date-picker clearable
-            v-model="form.lastUpdateTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择最近更新时间">
-          </el-date-picker>
+        <el-form-item label="状态" prop="isEnable">
+          <el-select v-model="form.providerStatus" placeholder="请选择启用状态" clearable :style="{width: '100%'}">
+            <el-option v-for="(item, index) in providerStatusOptions" :key="index" :label="item.label"
+                       :value="item.value" :disabled="item.disabled"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -171,6 +173,13 @@ export default {
         lastUpdateUser: null,
         lastUpdateTime: null
       },
+      providerStatusOptions: [{
+        "label": "启用",
+        "value": 0
+      }, {
+        "label": "禁用",
+        "value": 1
+      }],
       // 表单参数
       form: {},
       // 表单校验
@@ -202,12 +211,13 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
         providerId: null,
         providerName: null,
         providerContact: null,
         providerAddress: null,
-        providerStatus: 2,
-        providerType: null,
+        providerStatus: null,
+        providerType: 2,
         lastUpdateUser: null,
         lastUpdateTime: null
       };
@@ -225,7 +235,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.providerId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -238,7 +248,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const providerId = row.providerId || this.ids
+      const providerId = row.id || this.ids
       getProvider(providerId).then(response => {
         this.form = response.data;
         this.open = true;
@@ -249,7 +259,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.providerId != null) {
+          if (this.form.id != null) {
             updateProvider(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -267,7 +277,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const providerIds = row.providerId || this.ids;
+      const providerIds = row.id || this.ids;
       this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + providerIds + '"的数据项？').then(function() {
         return delProvider(providerIds);
       }).then(() => {
diff --git a/src/views/system/provider/index.vue b/src/views/system/provider/index.vue
index 859d64d..f94cd41 100644
--- a/src/views/system/provider/index.vue
+++ b/src/views/system/provider/index.vue
@@ -67,7 +67,11 @@
       <el-table-column label="供应商名称" align="center" prop="providerName" />
       <el-table-column label="电话" align="center" prop="providerContact" />
       <el-table-column label="地址" align="center" prop="providerAddress" />
-      <el-table-column label="状态" align="center" prop="providerStatus" />
+      <el-table-column label="状态" align="center" prop="providerStatus" >
+        <template slot-scope="scope">
+          {{scope.row.providerStatus=='1'?'禁用':'启用'}}
+        </template>
+      </el-table-column>
       <!--<el-table-column label="最近更新用户" align="center" prop="lastUpdateUser" />-->
       <!--<el-table-column label="最近更新时间" align="center" prop="lastUpdateTime" width="180">-->
         <!--<template slot-scope="scope">-->
@@ -105,25 +109,23 @@
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="供应商编码" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入供应商编码" />
+        </el-form-item>
         <el-form-item label="供应商名称" prop="providerName">
           <el-input v-model="form.providerName" placeholder="请输入供应商名称" />
         </el-form-item>
-        <el-form-item label="联系方式" prop="providerContact">
-          <el-input v-model="form.providerContact" placeholder="请输入联系方式" />
+        <el-form-item label="电话" prop="providerContact">
+          <el-input v-model="form.providerContact" placeholder="请输入电话" />
         </el-form-item>
         <el-form-item label="地址" prop="providerAddress">
           <el-input v-model="form.providerAddress" placeholder="请输入地址" />
         </el-form-item>
-        <el-form-item label="最近更新用户" prop="lastUpdateUser">
-          <el-input v-model="form.lastUpdateUser" placeholder="请输入最近更新用户" />
-        </el-form-item>
-        <el-form-item label="最近更新时间" prop="lastUpdateTime">
-          <el-date-picker clearable
-            v-model="form.lastUpdateTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择最近更新时间">
-          </el-date-picker>
+        <el-form-item label="状态" prop="isEnable">
+          <el-select v-model="form.providerStatus" placeholder="请选择启用状态" clearable :style="{width: '100%'}">
+            <el-option v-for="(item, index) in providerStatusOptions" :key="index" :label="item.label"
+                       :value="item.value" :disabled="item.disabled"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -171,6 +173,13 @@ export default {
         lastUpdateUser: null,
         lastUpdateTime: null
       },
+      providerStatusOptions: [{
+        "label": "启用",
+        "value": 0
+      }, {
+        "label": "禁用",
+        "value": 1
+      }],
       // 表单参数
       form: {},
       // 表单校验
@@ -202,6 +211,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
         providerId: null,
         providerName: null,
         providerContact: null,
@@ -225,7 +235,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.providerId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -238,7 +248,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const providerId = row.providerId || this.ids
+      const providerId = row.id || this.ids
       getProvider(providerId).then(response => {
         this.form = response.data;
         this.open = true;
@@ -249,7 +259,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.providerId != null) {
+          if (this.form.id != null) {
             updateProvider(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -267,7 +277,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const providerIds = row.providerId || this.ids;
+      const providerIds = row.id || this.ids;
       this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + providerIds + '"的数据项？').then(function() {
         return delProvider(providerIds);
       }).then(() => {