no message

src/api/business/entrust/currentWorkOrder.js

@@ -59,6 +59,14 @@ export function delEntrust(data) {
   })
 }
 
+export function okDelEntrust(data) {
+  request.defaults.baseURL = '/ezhizao-yzbh-entrust'
+  return request({
+    url: '/business/workOrderCurrent/okDelEntrust',
+    method: 'post',
+    data: data
+  })
+}
 export function getFactories() {
   request.defaults.baseURL = '/ezhizao-yzbh-entrust'
   return request({

src/api/business/examine.js

@@ -42,3 +42,12 @@ export function delExamine(id) {
     method: 'delete'
   })
 }
+
+export function refuse(data) {
+  request.defaults.baseURL = '/ezhizao-yzbh-entrust'
+  return request({
+    url: '/business/examine/refuse',
+    method: 'post',
+    data: data
+  })
+}

src/views/business/entrust/workOrder/currentMonth/index.vue

@@ -46,7 +46,24 @@
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-      <el-table-column label="客户名称" align="center" min-width="250" prop="companyName" />
+      <el-table-column label="客户名称" align="center" min-width="250" prop="companyName" >
+        <template #default="scope">
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.entrustExamine ">
+              <el-tooltip content="等待取消委托确认" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
       <el-table-column label="工单类型" align="center" prop="amount" min-width="80">
         <template #default="scope">
@@ -247,7 +264,7 @@
     loading.value = true;
     saveExamine(form.value).then((res) => {
       proxy.$modal.msgSuccess("取消成功");
-      cancelEntrust.value = true
+      cancelEntrust.value = false
       getList();
     }).finally(() => {
       loading.value = false;

src/views/business/examine/index.vue

@@ -75,13 +75,25 @@
 
         <!-- 表单 -->
         <examine-form ref="examineRef" :get-list="getList"></examine-form>
+        <el-dialog title="拒绝取消" v-model="cancelEntrust" width="720px" append-to-body size="small" draggable
+            :close-on-click-modal="false">
+            <el-form-item label="拒绝理由" prop="refuseReason" style="margin-top: 10px">
+                <el-input v-model="form.refuseReason" type="textarea" placeholder="请输入取消理由" />
+            </el-form-item>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" icon="Finished" size="small" @click="submitForm">确 定</el-button>
+                    <el-button icon="close" size="small" @click="cancelEntrust = false">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
 <script setup name="Examine">
-    import { listExamine, delExamine } from "@/api/business/examine";
+    import { listExamine, delExamine, refuse } from "@/api/business/examine";
     import {
-        delEntrust,
+        okDelEntrust,
     } from "@/api/business/entrust/currentWorkOrder";
     const { proxy } = getCurrentInstance()
     /** 字典数组区 */
@@ -91,6 +103,7 @@
     const loading = ref(true);
     const ids = ref([])
     const single = ref(true);
+    const cancelEntrust = ref(false);
     const multiple = ref(true);
     const total = ref(0);
     /** 查询对象 */
@@ -102,7 +115,7 @@
         cancelReason: null,
         status: null,
     })
-
+    const form = ref({});
     /***********************  方法区  ****************************/
 
     /** 查询企业租户列表 */
@@ -141,31 +154,43 @@
 
     /** 修改按钮操作 */
     function handleUpdate(row) {
-      
+
+
         proxy.$modal
             .confirm("确定同意么?")
             .then((_) => {
                 const entrust = {
                     workMonth: row.currentPeriod,
-                    workOrderIds:[row.id],
+                    workOrderIds: [row.workOrderId],
+                    examineId: row.id
                 };
-                delEntrust(entrust).then((res) => {
+
+                okDelEntrust(entrust).then((res) => {
+                    proxy.$modal.msgSuccess("同意成功");
                     getList();
                 });
             })
             .catch((_) => { });
     }
-
+    function submitForm() {
+        if(form.value.refuseReason == null){
+            proxy.$modal.msgError("请填写拒绝理由");
+            return;
+        }
+        console.log(23,form.value);
+        refuse(form.value).then((res) => {
+            proxy.$modal.msgSuccess("操作成功");
+            getList();
+            cancelEntrust.value = false;
+         });
+    }
 
     /** 删除按钮操作 */
     function handleDelete(row) {
-        const _ids = row.id || ids.value;
-        proxy.$modal.confirm('是否确认删除选中的数据项？').then(function () {
-            return delExamine(_ids);
-        }).then(() => {
-            getList();
-            proxy.$modal.msgSuccess("删除成功！");
-        }).catch(() => { });
+        cancelEntrust.value = true;
+        form.value.id = row.id
+        console.log(form.value);
+        
     }
 
     /** 导出按钮操作 */