瀏覽代碼

feature: 代理商经销商添加钉钉审批

liuyaqi 2 年之前
父節點
當前提交
ec89f14f67

+ 2 - 0
src/views/base/agent/components/AgentEdit.vue

@@ -178,6 +178,7 @@
           proxyEndTime: '',
           proxyStartTime: '',
           contractUrl: '',
+          contracFileName: '',
         },
         dist: {
           distName: [{ required: true, trigger: 'blur', message: '请输入经销商名称' }],
@@ -372,6 +373,7 @@
               }
               asyncUploadFile(option).then(() => {
                 _this.form.contractUrl = uploadform.fileUrl
+                _this.form.contracFileName = file_name
               })
             } else {
               _this.$message({

+ 22 - 4
src/views/base/agent/index.vue

@@ -98,6 +98,12 @@
               <span v-else-if="item.prop === 'invoicedAmount'">
                 {{ formatPrice(row.invoicedAmount) }}
               </span>
+              <span v-else-if="item.prop === 'approItem'">
+                {{ row.approStatus == '20' ? row.approItem : '-' }}
+              </span>
+              <span v-else-if="item.prop === 'approStatus'">
+                {{ row.approStatus == '20' ? '待审核' : '-' }}
+              </span>
               <span v-else>{{ row[item.prop] }}</span>
             </template>
           </el-table-column>
@@ -106,10 +112,8 @@
             <template #default="{ row }">
               <el-button type="text" @click="changeDistr(row)">转为经销</el-button>
               <el-button type="text" @click="$refs.changeAgent.open(row, 'renewal')">续签</el-button>
-              <el-button v-permissions="['base:distributor:edit']" type="text" @click="handleEdit(row)">编辑</el-button>
-              <el-button v-permissions="['base:distributor:delete']" type="text" @click="handleDelete(row)">
-                删除
-              </el-button>
+              <el-button v-permissions="['base:agent:edit']" type="text" @click="handleEdit(row)">编辑</el-button>
+              <el-button v-permissions="['base:agent:delete']" type="text" @click="handleDelete(row)">删除</el-button>
             </template>
           </el-table-column>
           <template #empty>
@@ -221,6 +225,20 @@
             sortable: false,
             disableCheck: false,
           },
+          {
+            label: '审核类型',
+            width: 'auto',
+            prop: 'approItem',
+            sortable: false,
+            disableCheck: false,
+          },
+          {
+            label: '审核状态',
+            width: 'auto',
+            prop: 'approStatus',
+            sortable: false,
+            disableCheck: false,
+          },
           {
             label: '创建时间',
             width: '100px',

+ 6 - 0
src/views/base/components/HistoryProxy.vue

@@ -97,6 +97,12 @@
             prop: 'historyCustomer',
             sortable: false,
           },
+          {
+            label: '转移经销商原因',
+            width: '160px',
+            prop: 'toDistReason',
+            sortable: false,
+          },
         ],
         customerOptions: [],
       }

+ 2 - 0
src/views/base/distributor/components/ChangeAgent.vue

@@ -79,6 +79,7 @@
           proxyEndTime: '',
           proxyStartTime: '',
           contractUrl: '',
+          contracFileName: '',
         },
         dist: {
           customerType: [{ required: true, trigger: 'blur', message: '请输入授权客户类型' }],
@@ -208,6 +209,7 @@
               }
               asyncUploadFile(option).then(() => {
                 _this.form.contractUrl = uploadform.fileUrl
+                _this.form.contracFileName = file_name
               })
             } else {
               _this.$message({

+ 20 - 0
src/views/base/distributor/index.vue

@@ -102,6 +102,12 @@
               <span v-else-if="item.prop === 'invoicedAmount'">
                 {{ formatPrice(row.invoicedAmount) }}
               </span>
+              <span v-else-if="item.prop === 'approItem'">
+                {{ row.approStatus == '20' ? row.approItem : '-' }}
+              </span>
+              <span v-else-if="item.prop === 'approStatus'">
+                {{ row.approStatus == '20' ? '待审核' : '-' }}
+              </span>
               <span v-else>{{ row[item.prop] }}</span>
             </template>
           </el-table-column>
@@ -224,6 +230,20 @@
             sortable: false,
             disableCheck: true,
           },
+          {
+            label: '审核类型',
+            width: 'auto',
+            prop: 'approItem',
+            sortable: false,
+            disableCheck: false,
+          },
+          {
+            label: '审核状态',
+            width: 'auto',
+            prop: 'approStatus',
+            sortable: false,
+            disableCheck: false,
+          },
           {
             label: '创建时间',
             width: '100px',