no message

src/api/business/entrust/currentWorkOrder.js

@@ -143,4 +143,16 @@ export function exportNextFactory(query) {
     },
     `下月工单导出_${new Date().getTime()}.xlsx`
   )
+}
+
+
+
+// 添加委托
+export function saveExamine(data) {
+  request.defaults.baseURL = '/ezhizao-yzbh-entrust'
+  return request({
+    url: '/business/workOrderCurrent/saveExamine',
+    method: 'post',
+    data: data
+  })
 }

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

@@ -115,9 +115,16 @@
     <exports ref="exportRef" :get-list="getList"></exports>
     <el-dialog title="取消委托" v-model="cancelEntrust" width="720px" append-to-body size="small" draggable
       :close-on-click-modal="false">
+      <span style="font-size: 12px;">
+        {{companyName}} 的服务工厂已经开始了，<br>需要工厂确认才可以取消，请填写取消理由
+      </span>
+      
+      <el-form-item label="取消理由" prop="cancelReason" style="margin-top: 10px" >
+        <el-input v-model="form.cancelReason" type="textarea" placeholder="请输入取消理由" />
+      </el-form-item>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
+          <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>
@@ -128,6 +135,7 @@
 <script setup name="CurrentMonthWorkOrder">
   import InitMonthDialog from "../initMonthDialog";
   import exports from "./export.vue"
+
   import { getToken, getTenant } from "@/utils/auth";
   import {
     listCurrentWorkOrder,
@@ -135,7 +143,7 @@
     exportCurrentWorkOrder,
     delEntrust,
     transNext,
-    addEntrust, exportStore
+    addEntrust, exportStore,saveExamine
   } from "@/api/business/entrust/currentWorkOrder";
   import SetEntrustDialog from "../setEntrustDialog";
   import useUserStore from "@/store/modules/user";
@@ -157,10 +165,10 @@
   const tenantId = ref(getTenant());
   const permissions = useUserStore().permissions;
   const all_permission = "*:*:*";
-
+  const form = ref({});
   const initMonthDialogRef = ref(null);
   const setEntrustDialogRef = ref(null);
-
+  const companyName = ref(null);
   const showInitMonth = ref(false);
   const cancelEntrust = ref(false);
   const { contract_verify_status } = proxy.useDict("contract_verify_status");
@@ -231,6 +239,20 @@
   function exportZero() {
     proxy.$refs.exportRef.open();
   }
+  function submitForm() {
+    if (form.value.cancelReason == undefined || form.value.cancelReason == "") {
+      proxy.$modal.msgError("请输入取消原因");
+    }
+    form.value.workMonth  =  currentMonth.value,
+    loading.value = true;
+    saveExamine(form.value).then((res) => {
+      proxy.$modal.msgSuccess("取消成功");
+      cancelEntrust.value = true
+      getList();
+    }).finally(() => {
+      loading.value = false;
+    })
+  }
   // 多选框选中数据
   function handleSelectionChange(selection) {
     ids.value = selection.map((item) => item.id);
@@ -295,9 +317,9 @@
       loading.value = true; // 
       delEntrust(entrust).then((res) => {
         if (res.data != null) {
-          console.log(res.data.companyName);
-          res.data.companyName
-          res.data.com
+          companyName.value = res.data.companyName
+          form.value.workOrderIds = res.data.workOrderIds
+          // res.data.com
           cancelEntrust.value = true;
         } else {
           proxy.$modal.msgSuccess("取消成功");
@@ -305,7 +327,7 @@
         }
         loading.value = false;
       }).catch(() => {
-       
+
       }).finally(() => {
         loading.value = false; // 确保在请求完成时也关闭加载状态
       })

src/views/business/examine/form.vue

@@ -1,177 +0,0 @@
-<template>
-    <!-- 添加或修改项目信息对话框 -->
-    <div class="el-drawer__wrapper">
-        <el-drawer :title="title" v-model="visible" direction="rtl" size="100%">
-            <div class="page-container form-container">
-            <div class="form-btns-container">
-                    <span class="title-label"><el-icon>
-                            <Document />
-                        </el-icon> 项目信息</span>
-                <el-button-group>
-                    <el-button v-if="editStatus" type="primary" size="small" icon="Finished"
-                               @click="submitForm">保存</el-button>
-                    <el-button v-else type="warning" size="small" icon="Edit" @click="editStatus = true">编辑</el-button>
-                    <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close"
-                               @click="editStatus = false">取消编辑</el-button>
-                    <el-button v-if="form.id" type="success" size="small" @click="getForm">
-                        <i class="fa fa-refresh" aria-hidden="true" /> 刷新
-                    </el-button>
-                </el-button-group>
-                <div class="screen-btn" @click="handleScreen">
-                    <template v-if="!isFullscreen">
-                        <i class="fa fa-window-maximize" aria-hidden="true" />
-                        <!-- <span>全屏</span> -->
-                    </template>
-                    <template v-else>
-                        <i class="fa fa-window-restore" aria-hidden="true" />
-                        <!-- <span>还原</span> -->
-                    </template>
-                </div>
-                <div class="close-btn" @click="cancel">
-                    <i class="fa fa-times" aria-hidden="true" />
-                    <!-- <span>关闭</span> -->
-                </div>
-            </div>
-            <div class="Y-scrollbar" style="position: absolute; top: 32px; bottom: 0; width: 100%; overflow: auto">
-            </div>
-            <el-form ref="examineRef" class="master-container" :model="form" :rules="rules" label-width="120px">
-                <el-row :gutter="30">
-                                    <el-col :span="6">
-                                        <el-form-item label="所属期" prop="currentPeriod">
-                                            <el-input  v-if="editStatus" v-model="form.currentPeriod" placeholder="请输入所属期" />
-                                            <span v-else>{{ form.currentPeriod }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="委托来源" prop="entrustCome">
-                                            <el-input  v-if="editStatus" v-model="form.entrustCome" placeholder="请输入委托来源" />
-                                            <span v-else>{{ form.entrustCome }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-form-item label="取消理由" prop="cancelReason">
-                                            <el-input  v-if="editStatus" v-model="form.cancelReason" placeholder="请输入取消理由" />
-                                            <span v-else>{{ form.cancelReason }}</span>
-                                        </el-form-item>
-                                    </el-col>
-                </el-row>
-            </el-form>
-            </div>
-        </el-drawer>
-    </div>
-</template>
-<script setup>
-    import {getExamine} from "@/api/business/examine";
-    const { proxy } = getCurrentInstance()
-    /** 父组件传参 */
-    const props = defineProps({
-        getList: {
-            type: Function,
-            default: () => { }
-        }
-    })
-    const { getList } = toRefs(props)
-    /** 字典数组区 */
-    /** 表单抽屉 页变量 */
-    const title = ref("")
-    const loading = ref(false)
-    const multiple = ref(true)
-    const visible = ref(false)
-    const editStatus = ref(false)
-    const isFullscreen = ref(false)
-    const webHost = import.meta.env.VITE_APP_BASE_API
-    const data = reactive({
-        form: {},
-        rules: {
-        }
-    });
-    const { form, rules } = toRefs(data);
-/***********************  方法区  ****************************/
-    /** 打开抽屉 */
-    function open(id) {
-        reset();
-        visible.value = true;
-        if (id) {
-            getExamine(id).then(response => {
-                form.value = response.data;
-                editStatus.value = false
-                title.value = "修改项目信息"
-            })
-        } else {
-            editStatus.value = true
-            title.value = "添加项目信息"
-        }
-    }
-
-    /** 取消按钮 */
-    function cancel() {
-        visible.value = false;
-        reset();
-    }
-
-    /** 表单重置 */
-    function reset() {
-        form.value = {
-                        id: null,
-                        workOrderId: null,
-                        entrustId: null,
-                        companyId: null,
-                        taskTypeId: null,
-                        currentPeriod: null,
-                        entrustCome: null,
-                        cancelReason: null,
-                        status: null,
-                        createTime: null,
-                        creatorId: null,
-                        updateTime: null,
-                        updaterId: null,
-                        deleted: null,
-                        version: null,
-                        tenantId: null
-        };
-        proxy.resetForm("examineRef");
-    }
-
-    /** 全屏缩放 */
-    function handleScreen() {
-    const dom = document.querySelector('.list-container > .el-drawer__wrapper > .el-overlay')
-    isFullscreen.value = !isFullscreen.value
-    dom.style.position = isFullscreen.value ? 'fixed' : 'absolute'
-    }
-
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["examineRef"].validate(valid => {
-    if (valid) {
-      if (form.value.id != null) {
-        updateExamine(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          visible.value = false;
-          getList.value()
-        });
-      } else {
-        addExamine(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          visible.value = false;
-          getList.value()
-        });
-      }
-    }
-  });
-}
-
-    /** 查询表单信息  */
-    function getForm() {
-    loading.value = true
-    getExamine(form.value.id).then(response => {
-        loading.value = false
-        form.value = response.data
-    })
-    }
-
-    /** 暴露给父组件的方法 */
-    defineExpose({
-        open
-    })
-</script>

src/views/business/examine/index.vue

@@ -2,67 +2,34 @@
     <div class="page-container list-container">
         <!-- 功能按钮区 -->
         <div class="list-btns-container">
-            <el-button
-                    type="primary"
-                    size="small"
-                    icon="Plus"
-                    @click="handleAdd"
-                    v-hasPermi="['business:examine:add']"
-            >新增</el-button>
-
-            <el-button
-                    type="success"
-                    size="small"
-                    icon="Edit"
-                    :disabled="single"
-                    @click="handleUpdate"
-                    v-hasPermi="['business:examine:edit']"
-            >修改</el-button>
-
-            <el-button
-                    type="danger"
-                    size="small"
-                    icon="Delete"
-                    :disabled="multiple"
-                    @click="handleDelete"
-                    v-hasPermi="['business:examine:remove']"
-            >删除</el-button>
-
-            <el-button
-                    type="warning"
-                    size="small"
-                    icon="Download"
-                    @click="handleExport"
-                    v-hasPermi="['business:examine:export']"
-            >导出</el-button>
+            <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
+                v-hasPermi="['business:examine:add']">新增</el-button>
+
+            <el-button type="success" size="small" icon="Edit" :disabled="single" @click="handleUpdate"
+                v-hasPermi="['business:examine:edit']">修改</el-button>
+
+            <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
+                v-hasPermi="['business:examine:remove']">删除</el-button>
+
+            <el-button type="warning" size="small" icon="Download" @click="handleExport"
+                v-hasPermi="['business:examine:export']">导出</el-button>
             <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
         </div>
         <!-- 搜索区 -->
-        <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
-                        <el-form-item label="所属期：" prop="currentPeriod">
-                            <el-input
-                                    v-model="queryParams.currentPeriod"
-                                    placeholder="请输入所属期"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="委托来源：" prop="entrustCome">
-                            <el-input
-                                    v-model="queryParams.entrustCome"
-                                    placeholder="请输入委托来源"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="取消理由：" prop="cancelReason">
-                            <el-input
-                                    v-model="queryParams.cancelReason"
-                                    placeholder="请输入取消理由"
-                                    clearable
-                                    @keyup.enter="handleQuery"
-                            />
-                        </el-form-item>
+        <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+            label-width="68px">
+            <el-form-item label="所属期：" prop="currentPeriod">
+                <el-input v-model="queryParams.currentPeriod" placeholder="请输入所属期" clearable
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="委托来源：" prop="entrustCome">
+                <el-input v-model="queryParams.entrustCome" placeholder="请输入委托来源" clearable
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="取消理由：" prop="cancelReason">
+                <el-input v-model="queryParams.cancelReason" placeholder="请输入取消理由" clearable
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                 <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -70,23 +37,41 @@
         </el-form>
 
         <!-- 列表区 -->
-        <el-table v-loading="loading" :data="examineList" size="small" border height="100%" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="examineList" size="small" border height="100%"
+            @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
-                    <el-table-column label="${comment}" align="center" prop="id" />
-                    <el-table-column label="所属期" align="center" prop="currentPeriod" />
-                    <el-table-column label="委托来源" align="center" prop="entrustCome" />
-                    <el-table-column label="取消理由" align="center" prop="cancelReason" />
-                    <el-table-column label="1同意 2拒绝" align="center" prop="status" />
+            <el-table-column label="客户名称" align="center" prop="companyName" />
+            <el-table-column label="税号" align="center" prop="socialCreditCode" />
+            <el-table-column label="项目" align="center" prop="taskName" />
+            <el-table-column label="所属期" align="center" prop="currentPeriod">
+                <template #default="scope">
+                    {{ scope.row.currentPeriod.substr(0, 7) }}
+                </template>
+            </el-table-column>
+
+            <el-table-column label="提交时间" align="center" prop="createTime" />
+            <el-table-column label="委托来源" align="center" prop="fromTenant" />
+            <el-table-column label="取消理由" align="center" prop="cancelReason" />
+            <el-table-column label="状态" align="center" prop="status">
+                <template #default="scope">
+                    <div v-if="scope.row.status === 0" type="danger">待确认</div>
+                    <div v-else-if="scope.row.status === 1" type="success">已同意</div>
+                    <div v-else type="info">已拒绝</div>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template #default="scope">
-                    <el-button link type="warning" size="small" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:examine:edit']">修改</el-button>
-                    <el-button link type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['business:examine:remove']">删除</el-button>
+                    <el-button link type="warning" size="small" icon="Edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['business:examine:edit']">同意</el-button>
+                    <el-button link type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['business:examine:remove']">拒绝</el-button>
                 </template>
             </el-table-column>
         </el-table>
 
         <!-- 分页 -->
-        <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList"/>
+        <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
 
         <!-- 表单 -->
         <examine-form ref="examineRef" :get-list="getList"></examine-form>
@@ -95,7 +80,9 @@
 
 <script setup name="Examine">
     import { listExamine, delExamine } from "@/api/business/examine";
-    import examineForm from "./form"
+    import {
+        delEntrust,
+    } from "@/api/business/entrust/currentWorkOrder";
     const { proxy } = getCurrentInstance()
     /** 字典数组区 */
     /** 查询 对象 */
@@ -107,22 +94,22 @@
     const multiple = ref(true);
     const total = ref(0);
     /** 查询对象 */
-   const queryParams=ref({
+    const queryParams = ref({
         pageNum: 1,
         pageSize: 10,
-                    currentPeriod: null,
-                    entrustCome: null,
-                    cancelReason: null,
-                    status: null,
+        currentPeriod: null,
+        entrustCome: null,
+        cancelReason: null,
+        status: null,
     })
 
-  /***********************  方法区  ****************************/
+    /***********************  方法区  ****************************/
 
     /** 查询企业租户列表 */
-   function getList() {
+    function getList() {
         loading.value = true;
         listExamine(queryParams.value).then(response => {
-                examineList.value = response.rows;
+            examineList.value = response.rows;
             total.value = response.total;
             loading.value = false;
         });
@@ -149,25 +136,36 @@
 
     /** 新增按钮操作 */
     function handleAdd() {
-         proxy.$refs.examineRef.open()
+        proxy.$refs.examineRef.open()
     }
 
     /** 修改按钮操作 */
     function handleUpdate(row) {
-        const id = row.id || ids.value
-        proxy.$refs.examineRef.open(id)
+      
+        proxy.$modal
+            .confirm("确定同意么?")
+            .then((_) => {
+                const entrust = {
+                    workMonth: row.currentPeriod,
+                    workOrderIds:[row.id],
+                };
+                delEntrust(entrust).then((res) => {
+                    getList();
+                });
+            })
+            .catch((_) => { });
     }
 
 
     /** 删除按钮操作 */
     function handleDelete(row) {
         const _ids = row.id || ids.value;
-        proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
+        proxy.$modal.confirm('是否确认删除选中的数据项？').then(function () {
             return delExamine(_ids);
         }).then(() => {
             getList();
             proxy.$modal.msgSuccess("删除成功！");
-        }).catch(() => {});
+        }).catch(() => { });
     }
 
     /** 导出按钮操作 */
@@ -177,5 +175,5 @@
         }, `examine_${new Date().getTime()}.xlsx`)
     }
 
-   getList();
-</script>
+    getList();
+</script>