采购员任命

2025-08-13 19:10:35 +08:00
parent fbe1dae085
commit b90b0a457c
12 changed files with 1210 additions and 286 deletions
--- a/src/views/cory/template/components/engineeringChangeApplicationForm.vue
+++ b/src/views/cory/template/components/engineeringChangeApplicationForm.vue
@ -3,17 +3,17 @@
    <el-table :data="data" style="width: 100%" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column align="center" prop="projectName" label="工程名称" />
-      <el-table-column align="center" prop="unitName" label="提出单位" />
-      <el-table-column align="center" prop="profession" label="专业" />
-      <el-table-column align="center" prop="applyDate" label="提出日期">
+      <el-table-column align="center" prop="submitUnit" label="提出单位" />
+      <el-table-column align="center" prop="specialty" label="专业" />
+      <el-table-column align="center" prop="submitDate" label="提出日期">
        <template #default="{ row }">
-          {{ formatDate(row.applyDate) }}
+          {{ formatDate(row.submitDate) }}
        </template>
      </el-table-column>
-      <el-table-column align="center" prop="bookName" label="卷册名称" />
-      <el-table-column align="center" prop="bookNo" label="卷册号" />
-      <el-table-column align="center" prop="changeContent" label="变更内容" />
-      <el-table-column align="center" prop="costEstimate" label="变更费用估算1" />
+      <el-table-column align="center" prop="volumeName" label="卷册名称" />
+      <el-table-column align="center" prop="volumeNumber" label="卷册号" />
+      <el-table-column align="center" prop="content" label="变更内容" />
+      <el-table-column align="center" prop="costEstimation" label="变更费用估算" />
      <el-table-column label="流程状态" align="center" prop="status">
        <template #default="scope">
          <dict-tag :options="wf_business_status" :value="scope.row.status" />
@ -40,15 +40,15 @@
          </el-row>
          <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
            <el-descriptions-item label-align="center" label="工程名称" class-name="zebra"> {{ tableDetail.projectName }} </el-descriptions-item>
-            <el-descriptions-item label-align="center" label="提出单位" class-name="zebra"> {{ tableDetail.unitName }} </el-descriptions-item>
-            <el-descriptions-item label-align="center" label="专业" label-class-name="white"> {{ tableDetail.profession }} </el-descriptions-item>
+            <el-descriptions-item label-align="center" label="提出单位" class-name="zebra"> {{ tableDetail.submitUnit }} </el-descriptions-item>
+            <el-descriptions-item label-align="center" label="专业" label-class-name="white"> {{ tableDetail.specialty }} </el-descriptions-item>
            <el-descriptions-item label-align="center" label="提出日期" label-class-name="white">
-              {{ dayjs(tableDetail.applyDate).format('YYYY-MM-DD') }}
+              {{ dayjs(tableDetail.submitDate).format('YYYY-MM-DD') }}
            </el-descriptions-item>
-            <el-descriptions-item label-align="center" label="卷册名称" class-name="zebra"> {{ tableDetail.bookName }} </el-descriptions-item>
-            <el-descriptions-item label-align="center" label="卷册号" class-name="zebra"> {{ tableDetail.bookNo }} </el-descriptions-item>
+            <el-descriptions-item label-align="center" label="卷册名称" class-name="zebra"> {{ tableDetail.volumeName }} </el-descriptions-item>
+            <el-descriptions-item label-align="center" label="卷册号" class-name="zebra"> {{ tableDetail.volumeNumber }} </el-descriptions-item>
            <el-descriptions-item label-align="center" label="附图" :span="2" label-class-name="white">
-              <image-preview :src="item.url" v-for="item in tableDetail.hasAttachmentList" width="200px" class="mr" />
+              <image-preview :src="item.url" v-for="item in tableDetail.attachments" width="200px" class="mr" />
            </el-descriptions-item>
            <el-descriptions-item label-align="center" label="变更原因" :span="2" class-name="zebra">
              <el-checkbox-group v-model="tableDetail.changeReasons">
@ -62,10 +62,10 @@
              </el-checkbox-group>
            </el-descriptions-item>
            <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white">
-              {{ tableDetail.changeContent }}
+              {{ tableDetail.content }}
            </el-descriptions-item>
            <el-descriptions-item label-align="center" label="变更费用估算" :span="2" class-name="zebra">
-              {{ tableDetail.costEstimate }}
+              {{ tableDetail.costEstimation }}
            </el-descriptions-item>
          </el-descriptions>
          <el-descriptions border direction="vertical" size="large">
@ -73,13 +73,13 @@
          </el-descriptions>
          <el-descriptions :column="2" border label-width="160px" size="large">
            <el-descriptions-item label-align="center" label="项目经理 " label-class-name="white">
-              {{ tableDetail.asupervisorLeader }}
+              {{ tableDetail.contractorLeader }}
            </el-descriptions-item>
            <el-descriptions-item label-align="center" label="日期" label-class-name="white">
-              {{ dayjs(tableDetail.asupervisorDate).format('YYYY-MM-DD') }}
+              {{ dayjs(tableDetail.contractorDate).format('YYYY-MM-DD') }}
            </el-descriptions-item>
          </el-descriptions>
-          <el-descriptions border direction="vertical" size="large">
+          <!-- <el-descriptions border direction="vertical" size="large">
            <el-descriptions-item label-align="center" label="总承包单位" class-name="none"></el-descriptions-item>
          </el-descriptions>
          <el-descriptions :column="2" border label-width="160px" size="large">
@ -100,36 +100,39 @@
            <el-descriptions-item label-align="center" label="日期" label-class-name="white">
              {{ dayjs(tableDetail.csupervisorDate).format('YYYY-MM-DD') }}
            </el-descriptions-item>
-          </el-descriptions>
+          </el-descriptions> -->
          <el-descriptions border direction="vertical" size="large">
            <el-descriptions-item label-align="center" label="项目监理单位" class-name="none"></el-descriptions-item>
          </el-descriptions>

          <!-- 单独插入整行占用的内容 -->
          <el-descriptions :column="2" border label-width="160px" size="large">
-            <el-descriptions-item label="总监理工程师" :span="2" label-align="center" label-class-name="white">
-              {{ tableDetail.dasupervisorLeader }}
+            <el-descriptions-item label="总监理工程师" label-align="center" label-class-name="white">
+              {{ tableDetail.supervisorLeader }}
+            </el-descriptions-item>
+            <el-descriptions-item label="日期" label-align="center" label-class-name="white">
+              {{ dayjs(tableDetail.supervisorDate).format('YYYY-MM-DD') }}
            </el-descriptions-item>
          </el-descriptions>
          <!-- 一组完整两列 -->
-          <el-descriptions :column="2" border label-width="160px" size="large">
-            <el-descriptions-item label="监理工程师" label-align="center" label-class-name="white">
+          <!-- <el-descriptions :column="2" border label-width="160px" size="large">
+             <el-descriptions-item label="监理工程师" label-align="center" label-class-name="white">
              {{ tableDetail.dsupervisorLeader }}
-            </el-descriptions-item>
+            </el-descriptions-item> 
            <el-descriptions-item label="日期" label-align="center" label-class-name="white">
-              {{ dayjs(tableDetail.dsupervisorDate).format('YYYY-MM-DD') }}
+              {{ dayjs(tableDetail.supervisorDate).format('YYYY-MM-DD') }}
            </el-descriptions-item>
-          </el-descriptions>
+          </el-descriptions> -->
          <el-descriptions border direction="vertical" size="large">
            <el-descriptions-item label-align="center" label="建设单位" class-name="none"></el-descriptions-item>
          </el-descriptions>
          <el-descriptions :column="2" border label-width="160px" size="large">
            <!-- <el-descriptions-item label-align="center" label="会签" :span="2" label-class-name="white"> {{ tableDetail.esupervisorLeader }} </el-descriptions-item> -->
            <el-descriptions-item label-align="center" label="负责人" label-class-name="white">
-              {{ tableDetail.esupervisorLeader }}
+              {{ tableDetail.ownerRep }}
            </el-descriptions-item>
            <el-descriptions-item label-align="center" label="日期" label-class-name="white">
-              {{ dayjs(tableDetail.esupervisorDate).format('YYYY-MM-DD') }}
+              {{ dayjs(tableDetail.ownerDate).format('YYYY-MM-DD') }}
            </el-descriptions-item>
          </el-descriptions>
        </div>
@ -169,8 +172,8 @@ const radioList = ref([
  { value: 3, label: '接口差错' },
  { value: 4, label: '业主要求' },
  { value: 5, label: '施工承包商要求' },
-  { value: 6, label: '外部资料不符' },
-  { value: 7, label: '材料代用或其他' }
+  { value: 6, label: '外部资料与最终情况不符' },
+  { value: 7, label: '材料代用及其他' }
 ]);
 const detailVisible = ref(false);
 const formatDate = (val: string | Date) => (val ? dayjs(val).format('YYYY-MM-DD') : '');
@ -208,7 +211,7 @@ const handleViewInfo = (row) => {
  // 添加审批
  proxy.$tab.closePage(proxy.$route);
  proxy.$router.push({
-    path: `/cory/template/indexEdit`,
+    path: `/relation-management/changeContact/indexEdit`,
    query: {
      thumbnailUrl: props.thumbnail,
      row: JSON.stringify(row),
--- a/src/views/cory/template/index.vue
+++ b/src/views/cory/template/index.vue
@ -190,7 +190,7 @@ const data = reactive<PageData<any, any>>({
    teamId: undefined,
    type: undefined,
    params: {},
-    ids: ['1942107830848872449', '1942107931415699457'],
+    // ids: ['1942107830848872449', '1942107931415699457'],
    projectType: undefined
  },
  rules: {
@ -233,18 +233,20 @@ const getList = async () => {
  if (!queryParams.value.projectType) {
    const res = await listContactTypeformtemplate(queryParams.value);
    projectTypeOptions.value = res.data;
-    queryParams.value.projectType = res.data[0].name;
-    thumbnailUrl.value = res.data[0].thumbnail;
-    queryParams.value.type = res.data[0].id as string;
+    queryParams.value.projectType = res.data[1].name;
+    thumbnailUrl.value = res.data[1].thumbnail;
+    queryParams.value.type = res.data[1].id as string;
  }
  const res = await listContactnotice(queryParams.value);
  res.rows = res.rows.map((item) => {
    return {
      ...item,
-      ...JSON.parse(item.detail)
+      ...JSON.parse(item.detail),
+      status: item.status
    };
  });
  tableData.value = res.rows;
+  console.log('🚀 ~ getList ~ tableData.value:', tableData.value);
  total.value = res.total || 0;
 };
 const handleDelete = async (id?: string) => {
@ -282,6 +284,7 @@ const handleAddApp = (row) => {
    path: `/relation-management/changeContact/indexEdit`,
    query: {
      thumbnailUrl: projectTypeOptions.value[1].thumbnail,
+      id: projectTypeOptions.value[1].id,
      row,
      type: 'add'
    }
--- a/src/views/cory/template/indexEdit.vue
+++ b/src/views/cory/template/indexEdit.vue
@ -31,7 +31,7 @@
          >
            <div class="grid grid-cols-1 gap-4">
              <div class="flex">
-                <div><image-preview :src="thumbnailUrl" width="150px"></image-preview></div>
+                <div v-if="thumbnailUrl"><image-preview :src="thumbnailUrl" width="150px"></image-preview></div>
                <div>
                  <el-row :gutter="20">
                    <el-col :span="12">
@ -69,9 +69,9 @@
                    </el-col>
                    <el-col :span="12">
                      <el-form-item label="附图">
-                        <el-upload v-model:file-list="form.attachments" action="#" list-type="text">
+                        <file-Upload v-model="form.attachments">
                          <el-button type="primary">上传附件</el-button>
-                        </el-upload>
+                        </file-Upload>
                      </el-form-item>
                    </el-col>
                  </el-row>
@ -286,8 +286,9 @@ const getInfo = () => {
  nextTick(async () => {
    const res = await getContactnotice(routeParams.value.id);
    var data = {
-      ...JSON.parse(routeParams.value.row),
-      ...JSON.parse(res.data.detail)
+      // ...JSON.parse(routeParams.value.row),
+      ...JSON.parse(res.data.detail),
+      ...res.data
    };
    console.log(routeParams.value);

@ -303,11 +304,19 @@ const submitForm = (status1: string) => {
  leaveFormRef.value?.validate(async (valid: boolean) => {
    if (valid) {
      buttonLoading.value = true;
+      let data = {
+        detail: JSON.stringify(form.value),
+        type: routeParams.value.id,
+
+        projectId: currentProject.value?.id
+      };
      var res;
      if (form.value.id) {
-        res = await updateContactnotice(form.value).finally(() => (buttonLoading.value = false));
+        res = await updateContactnotice(data).finally(() => (buttonLoading.value = false));
+        Object.assign(form.value, res.data);
      } else {
-        res = await addContactnotice(form.value).finally(() => (buttonLoading.value = false));
+        res = await addContactnotice(data).finally(() => (buttonLoading.value = false));
+        Object.assign(form.value, res.data);
      }
      if (res.code == 200) {
        dialog.visible = false;
@ -318,11 +327,15 @@ const submitForm = (status1: string) => {
 };

 const submitFlow = async () => {
+  console.log('form.value', form.value);
+
  handleStartWorkFlow(form.value);
  dialogVisible.visible = false;
 };
 //提交申请
 const handleStartWorkFlow = async (data: LeaveForm) => {
+  console.log('data', data);
+
  try {
    submitFormData.value.flowCode = flowCode.value;
    submitFormData.value.businessId = data.id;
@ -352,6 +365,10 @@ const submitCallback = async () => {
 };
 //审批
 const approvalVerifyOpen = async () => {
+  taskVariables.value = {
+    // leave4/5 使用的流程变量
+    costEstimation: form.value.costEstimation
+  };
  submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
 // 图纸上传成功之后 开始提交
@ -372,7 +389,7 @@ const submit = async (status, data) => {
    if (flowCode.value === '' || flowCode.value === null) {
      flowCode.value = 'xx';
    }
-    console.log(data);
+    console.log('data', data);
    await handleStartWorkFlow(data);
  }
 };