项目登记

src/api/jy/ProjectInfoService.js

@@ -0,0 +1,64 @@
+import request from '@/utils/httpRequest'
+import { BUSINESS_PATH as prefix } from "../AppPath";
+
+export default class ProjectInfoService {
+	list (param) {
+		return request({
+			url: prefix + '/jyProject/list',
+			method: 'get',
+			params: param
+		})
+	}
+	getHaveProjectIds () {
+		return request({
+			url: prefix + '/jyProject/getHaveProjectIds',
+			method: 'get'
+		})
+	}
+	findContractPageList (params) {
+		return request({
+			url: prefix + '/jyProject/findContractPageList',
+			method: 'get',
+			params: params
+		})
+	}
+	saveForm (inputForm) {
+		return request({
+			url: prefix + `/jyProject/saveForm`,
+			method: 'post',
+			data: inputForm
+		})
+	}
+	findById (id) {
+		return request({
+			url: prefix + '/jyProject/findById',
+			method: 'get',
+			params: {id: id}
+		})
+	}
+
+	updateStatusById (data) {
+		return request({
+			url: prefix + '/jyProject/updateStatusById',
+			method: 'post',
+			data: data
+		})
+	}
+
+	delete (ids) {
+		return request({
+			url: prefix + '/jyProject/deleteById',
+			method: 'get',
+			params: {id: ids}
+		})
+	}
+	deleteAll (ids) {
+		return request({
+			url: prefix + '/jyProject/delete',
+			method: 'delete',
+			params: {ids: ids}
+		})
+	}
+
+
+}

src/api/sys/areaService.js

@@ -41,4 +41,11 @@ export default {
 			params: { extId: extId },
 		});
 	},
+	getParent: function (id) {
+		return request({
+			url: prefix + "/sys/area/getParent",
+			method: "get",
+			params: { extId: id },
+		});
+	},
 };

src/views/flowable/task/TaskForm.vue

@@ -144,55 +144,57 @@
 							</el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :span="16">
-						<el-form-item>
-							<el-checkbox v-model="isCC">是否抄送</el-checkbox>
-						</el-form-item>
-					</el-col>
-					<el-col :span="16">
-						<el-form-item
-							v-if="isCC"
-							:rules="[
+					<el-row v-show=" companyName !=='嘉溢'">
+						<el-col :span="16">
+							<el-form-item>
+								<el-checkbox v-model="isCC">是否抄送</el-checkbox>
+							</el-form-item>
+						</el-col>
+						<el-col :span="16">
+							<el-form-item
+								v-if="isCC"
+								:rules="[
 								{
 									required: true,
 									message: '用户不能为空',
 									trigger: 'blur',
 								},
 							]"
-							prop="userIds"
-							label="抄送给"
-						>
-							<user-select
-								v-model="auditForm.userIds"
-							></user-select>
-						</el-form-item>
-					</el-col>
-					<!--<el-col :span="16">
-						<el-form-item>
-							<el-checkbox v-model="isAssign"
-								>指定下一步处理者(不设置就使用默认处理人)</el-checkbox
+								prop="userIds"
+								label="抄送给"
 							>
-						</el-form-item>
-					</el-col>-->
-					<el-col :span="16">
-						<el-form-item
-							v-if="isAssign"
-							:rules="[
+								<user-select
+									v-model="auditForm.userIds"
+								></user-select>
+							</el-form-item>
+						</el-col>
+						<!--<el-col :span="16">
+							<el-form-item>
+								<el-checkbox v-model="isAssign"
+									>指定下一步处理者(不设置就使用默认处理人)</el-checkbox
+								>
+							</el-form-item>
+						</el-col>-->
+						<el-col :span="16">
+							<el-form-item
+								v-if="isAssign"
+								:rules="[
 								{
 									required: true,
 									message: '用户不能为空',
 									trigger: 'blur',
 								},
 							]"
-							prop="assignee"
-							label="指定"
-						>
-							<user-select
-								:limit="1"
-								v-model="auditForm.assignee"
-							></user-select>
-						</el-form-item>
-					</el-col>
+								prop="assignee"
+								label="指定"
+							>
+								<user-select
+									:limit="1"
+									v-model="auditForm.assignee"
+								></user-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
 				</el-row>
 			</el-form>
 		</el-card>
@@ -269,6 +271,7 @@ import print2 from "@/utils/print.js";
 import { shallowRef } from 'vue'
 import CollectService from '@/api/materialManagement/CollectService'
 import WareHouseService from '@/api/materialManagement/WareHouseService'
+import userService from "@/api/sys/userService";
 export default {
 	collectService: null,
 	wareHouseService: null,
@@ -421,6 +424,7 @@ export default {
 			this.statusFlag = this.$route.query.statusFlag
 			this.wareHouseId = this.$route.query.wareHouseId
 			this.returnId = this.$route.query.returnId
+			this.officeNcompanyNameame=this.$store.state.user.company.name
 			if (this.commonJS.isEmpty(this.$route.query.isShow)) {
 				this.isShow = 'true'
 			} else {
@@ -691,6 +695,7 @@ export default {
 		// Process_1683767097901 物资管理-领用退回申请
 		// Process_1694762268070 报告-修改签字注师
 		// Process_1695863980264 嘉溢-合同归档
+		// Process_1697006029203 嘉溢-项目登记
 
 		// 驳回
 		reject(vars) {
@@ -730,7 +735,9 @@ export default {
 				this.procDefId.includes('Process_1678692643340') ||
 				this.procDefId.includes('Process_1683767097901') ||
 				this.procDefId.includes('Process_1694762268070') ||
-				this.procDefId.includes('Process_1695863980264')
+				this.procDefId.includes('Process_1695863980264') ||
+				this.procDefId.includes('Process_1697006029203')
+
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {
@@ -1298,7 +1305,8 @@ export default {
 			returnId: '',
 			dataListHi: [],
 			dataListHiCollect: [],
-			recordType:''
+			recordType:'',
+			companyName:''
 		};
 	},
 };

src/views/jy/project/ContractForm.vue

@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <el-dialog
+      title="选择合同"
+      :close-on-click-modal="false"
+	  draggable
+      width="1100px"
+      height="500px"
+      @close="close"
+      @keyup.enter.native=""
+      v-model="visible">
+      <div style="height: calc(100% - 80px);">
+        <el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+          <!-- 搜索框-->
+          <el-form-item label="合同名称" prop="name">
+            <el-input v-model="searchForm.name" placeholder="请输入合同名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="委托方" prop="primaryLinkman">
+            <el-input v-model="searchForm.primaryLinkman" placeholder="请输入委托方" clearable></el-input>
+          </el-form-item>
+          <!--<el-form-item label="创建人" prop="createBy">
+            <SelectUserTree
+              ref="companyTree"
+              :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+              :url="`/sys/user/treeUserDataAllOffice?type=2`"
+              :value="searchForm.createBy"
+              :clearable="true"
+              :accordion="true"
+              @getValue="(value) => {searchForm.createBy=value}"/>
+          </el-form-item>-->
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="400px"
+          :loading="loading"
+          size="small"
+          ref="workContractTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :print-config="{}"
+          @sort-change=""
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :checkbox-config="{}"
+		  :row-config="{isCurrent: true}"
+		  :radio-config="{trigger: 'row'}"
+		>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="radio" width="50px"></vxe-column>
+
+          <vxe-column min-width="200px" title="合同编号" field="no"></vxe-column>
+          <vxe-column min-width="200px" title="合同名称" field="name"></vxe-column>
+          <vxe-column min-width="150px" title="委托方" field="primaryLinkman"></vxe-column>
+          <vxe-column min-width="150px" title="合同类型" field="contractType"></vxe-column>
+          <vxe-column min-width="150px" title="创建时间" field="createTime"></vxe-column>
+          <vxe-column min-width="100px" title="创建人" field="createById"></vxe-column>
+
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" v-if="method != 'view'" @click="getContract()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import InputNumber from '@/views/workContract/InputNumber.vue'
+  import SelectUserTree from '@/views/utils/treeUserSelect'
+  import ProjectInfoService from "@/api/jy/ProjectInfoService";
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          primaryLinkman: '',
+          name: '',
+          contractDates: [],
+          type: '',
+          contractType: '',
+          createBy: this.$store.state.user.id,
+          procInsId: '',
+          processDefinitionId: ''
+        },
+        rowId: ''
+      }
+    },
+	  ProjectInfoService: null,
+    created () {
+      this.projectInfoService = new ProjectInfoService()
+    },
+    components: {
+      SelectUserTree,
+      InputNumber
+    },
+    methods: {
+      init (id) {
+        // if (!this.commonJS.isEmpty(id)) {
+        //   this.$refs.workContractTable.setCurrentRow(id)
+        // }
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getContract () {
+        let row = this.$refs.workContractTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请选择一条数据')
+          return
+        }
+        this.close()
+        this.$emit('getContract', row)
+      },
+      list () {
+        this.loading = true
+        this.searchForm.createBy = this.$store.state.user.id
+        this.projectInfoService.findContractPageList({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then((data) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        this.visible = false
+      }
+    }
+  }
+</script>

src/views/jy/project/ProjectDia.vue

@@ -0,0 +1,858 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+  <div>
+	  <el-dialog
+		  :title="title"
+		  :close-on-click-modal="false"
+		  draggable
+		  width="1300px"
+		  @close="close"
+		  @keyup.enter.native=""
+		  v-model="visible">
+		  <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method === 'view'"
+				   label-width="170px" @submit.native.prevent>
+        <el-row  :gutter="15">
+			<el-col :span="24">
+				<el-form-item label="合同情况:" prop="contractStatus"
+							  :rules="[
+							   {required: true, message:'请选择合同情况', trigger:'blur'}
+                 ]">
+				<el-radio-group v-model="inputForm.contractStatus" class="ml-4">
+					<el-radio label="1" size="large">有合同</el-radio> <el-radio label="0" size="large">无合同</el-radio>
+				</el-radio-group>
+				</el-form-item>
+			</el-col>
+			<el-row  :gutter="15" v-show="inputForm.contractStatus === '1'">
+				<el-col :span="24" >
+					<el-divider content-position="left"><i class="el-icon-document"></i> 选择合同</el-divider>
+					<el-form-item label="选择合同" prop="contractName"
+								  :rules="[
+                          {required: true, message:'合同不能为空', trigger:'blur'},
+                          {required: true, message:'合同不能为空', trigger:'change'}
+                 ]">
+						<el-input size="large" :readonly="true" @focus="openContractForm()" v-model="inputForm.contractName" placeholder="请选择合同">
+							<el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同名称" prop="contractName"
+								  :rules="[
+                 ]">
+						<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同金额(元)" prop="amount"
+								  :rules="[
+                 ]">
+						<!--              <el-input v-model="inputForm.amount" placeholder="请填写合同金额"></el-input>-->
+						<el-input-number
+							:disabled="true"
+							v-model="inputForm.amount"
+							controls-position="right"
+							:controls="false"
+							style="width:100%;"
+							:precision="2"
+							placeholder="请填写合同金额"
+							:step="0.01"
+							:min="0"
+							clearable>
+						</el-input-number>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="委托方" prop="clientName"
+								  :rules="[
+                 ]">
+						<el-input :disabled="true" v-model="inputForm.clientName" placeholder="请填写委托方"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
+								  :rules="[
+                 ]">
+						<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="合同类型(小类)" prop="contractType"
+								  :rules="[
+                 ]">
+						<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+
+        </el-row>
+        <el-divider content-position="left"><i class="el-icon-document"></i> 项目基本情况信息</el-divider>
+        <el-row  :gutter="15">
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="name"
+                          :rules="[
+                          {required: true, message:'项目名称不能为空', trigger:'blur'}
+                 ]">
+              <el-input maxlength="64" v-model="inputForm.name" placeholder="请输入项目名称" clearable></el-input>
+            </el-form-item>
+          </el-col>
+			<el-col :span="12">
+				<el-form-item label="项目所在地" prop="projectPlace"
+							  :rules="[
+                          {required: true, message:'项目所在地不能为空', trigger:'change'}
+                 ]">
+					<SelectTree
+						ref="areaTree"
+						:props="{
+                      value: 'id',             // ID字段名
+                      label: 'name',         // 显示名称
+                      children: 'children'    // 子级字段名
+                    }"
+						url="/system-server/sys/area/treeData"
+						:value="inputForm.projectPlace"
+						:clearable="true"
+						size="large"
+						:accordion="true"
+						@getValue="(value) => {inputForm.projectPlace=value}"
+						/>
+				</el-form-item>
+			</el-col>
+          <el-col :span="12">
+            <el-form-item label="所在省份" prop="provience"
+                          :rules="[
+                 ]">
+              <el-input :disabled="true" v-model="provience" placeholder="请输入所在省份" clearable></el-input>
+            </el-form-item>
+          </el-col>
+			<el-col :span="12">
+				<el-form-item label="所在地级市" prop="city"
+							  :rules="[
+                 ]">
+					<el-input :disabled="true" v-model="city" placeholder="请输入所在地级市" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="所在区县" prop="con"
+							  :rules="[
+                 ]">
+					<el-input :disabled="true" v-model="con" placeholder="请输入所在区县" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="建设地点" prop="buildPlace"
+							  :rules="[
+                 ]">
+					<el-input  v-model="inputForm.buildPlace" placeholder="请输入建设地点" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="项目负责人" prop="projectLeader"
+							  :rules="[
+                          {required: true, message:'项目负责人不能为空', trigger:'change'}
+                 ]">
+					<SelectUserTree
+						ref="companyTree"
+						size="large"
+						:props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+						:url="`/system-server/sys/user/treeUserDataJyOffice?type=2`"
+						:value="inputForm.projectLeader"
+						:clearable="true"
+						:accordion="true"
+						@getValue="(value) => {inputForm.projectLeader=value}"/>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="创建人" prop="createByName"
+							  :rules="[
+                   ]">
+					<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="创建时间" prop="createDate"
+							  :rules="[
+                   ]">
+					<el-input :disabled="true" v-model="inputForm.createDate" placeholder="请填写创建时间" clearable></el-input>
+				</el-form-item>
+			</el-col>
+
+          <el-col :span="24">
+            <el-form-item label="工程概况" prop="projectOverview"
+                          :rules="[
+                 ]">
+              <el-input type="textarea" v-model="inputForm.projectOverview" maxlength="500" placeholder="请输入工程概况" show-word-limit></el-input>
+            </el-form-item>
+          </el-col>
+			<el-col :span="24">
+				<el-form-item label="特殊要求" prop="special"
+							  :rules="[
+                 ]">
+					<el-input type="textarea" v-model="inputForm.special" maxlength="500" placeholder="请输入特殊要求" show-word-limit></el-input>
+				</el-form-item>
+			</el-col>
+        </el-row>
+        <el-divider content-position="left"><i class="el-icon-document"></i>
+			<span><span style="color: red;border-top: 20px">*</span>委托方联系人信息</span>
+          <el-button style="margin-left: 20px" type="primary" :disabled="this.inputForm.contractStatus === '1'" size="default" @click="openContactForm()" plain>
+            新增
+          </el-button>
+        </el-divider>
+        <el-row  :gutter="15" >
+			<el-col :span="24">
+				<vxe-table
+					border
+					show-overflow
+					ref="clientTable"
+					class="vxe-table-element"
+					:data="inputForm.clientList"
+					style="margin-left: 5em"
+					:key="clientTableKey"
+					:edit-rules="validRulesClient"
+					highlight-current-row
+					:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon: '#'}"
+				>
+					<vxe-table-column field="name" title="联系人" :edit-render="{}"  align="center">
+						<template v-slot:edit="scope">
+							<el-input :disabled="true" v-model="scope.row.name" ></el-input>
+						</template>
+					</vxe-table-column>
+<!--					<vxe-table-column  align="center" field="clientType" title="人员类型" :edit-render="{name: '$select', options: clientTypes}">-->
+<!--						<template v-slot:edit="scope">-->
+<!--							<vxe-select :disabled="status === 'audit' || status === 'taskFormDetail'" v-model="scope.row.clientType"  transfer>-->
+<!--								<vxe-option-->
+<!--									v-for="item in clientTypes"-->
+<!--									:key="item.value"-->
+<!--									:value="item.value"-->
+<!--									:label="item.label">-->
+<!--								</vxe-option>-->
+<!--							</vxe-select>-->
+<!--						</template>-->
+<!--					</vxe-table-column>-->
+					<vxe-table-column  align="center" field="linkPhone" title="联系方式1" :edit-render="{}">
+						<template v-slot:edit="scope">
+							<el-input :disabled="true" v-model="scope.row.linkPhone" ></el-input>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column  align="center" field="linkMobile" title="联系方式2" :edit-render="{}">
+						<template v-slot:edit="scope">
+							<el-input :disabled="true" v-model="scope.row.linkMobile" ></el-input>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column  align="center" field="position" title="职位" :edit-render="{}">
+						<template v-slot:edit="scope">
+							<el-input :disabled="true" v-model="scope.row.position" ></el-input>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column  align="center" title="操作" width="100">
+						<template v-slot="scope">
+							<el-button size="large" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'client')">删除</el-button>
+						</template>
+					</vxe-table-column>
+				</vxe-table>
+			</el-col>
+        </el-row>
+		  <el-row  :gutter="15" v-show=" method==='view' ">
+			  <el-col :span="24">
+        <el-divider content-position="left"><i class="el-icon-document"></i>
+          项目组成员
+        </el-divider>
+        <el-row  :gutter="15">
+			<el-col :span="24">
+				<vxe-table
+					border
+					show-footer
+					show-overflow
+					:footer-method="footerMethod"
+					ref="memberTable"
+					class="vxe-table-element"
+					:key="memberKey"
+					:data="inputForm.members"
+					style="margin-left: 5em"
+					@cell-click=""
+					:edit-rules="validRulesMember"
+					@edit-closed=""
+					highlight-current-row
+					:edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear:  status === 'audit' || status === 'taskFormDetail' ? true : false, icon: '#'}"
+				>
+					<vxe-table-column field="name" title="姓名" :edit-render="{name: '$input'}" align="center">
+						<template v-slot:edit="scope">
+							<vxe-input v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId) || status === 'audit' || status === 'taskFormDetail'"  style="width: 100%">
+								<template #suffix>
+									<el-button :disabled="true"  @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></el-button>
+								</template>
+							</vxe-input>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column field="workHours" title="预计工时（时）" :edit-render="{name: '$input'}"  align="center">
+						<template v-slot:edit="scope">
+							<vxe-input
+								:disabled="true"
+								v-model="scope.row.workHours"
+								type="float"
+								digits="1"
+								placeholder="请输入预计工时（时）"
+								clearable>
+							</vxe-input>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column  align="center" field="type" title="人员类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('program_registered_member_type')}">
+						<template v-slot:edit="scope">
+							<vxe-select :disabled="true" v-model="scope.row.type" placeholder="请选择人员类型" clearable style="width: 100%;" transfer>
+								<vxe-option
+									v-for="item in $dictUtils.getDictList('program_registered_member_type')"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value">
+								</vxe-option>
+							</vxe-select>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column align="center" field="job" title="项目职务" :edit-render="{name: '$select', options: $dictUtils.getDictList('program_registered_member_position')}">
+						<template v-slot:edit="scope">
+							<vxe-select :disabled="true" v-model="scope.row.job" placeholder="请选择项目职务" clearable style="width: 100%;" transfer>
+								<vxe-option
+									v-for="item in $dictUtils.getDictList('program_registered_member_position')"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value">
+								</vxe-option>
+							</vxe-select>
+						</template>
+					</vxe-table-column>
+					<vxe-table-column align="center" title="操作" width="100">
+						<template v-slot="scope">
+							<el-button :disabled="true" size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'member')">删除</el-button>
+						</template>
+					</vxe-table-column>
+				</vxe-table>
+			</el-col>
+        </el-row>
+			  </el-col>
+		  </el-row>
+		  </el-form>
+	  </el-dialog>
+      <!--        附件-->
+      <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+      <ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
+      <ContactForm  ref="contactForm" @getContract="getContact"></ContactForm>
+
+  </div>
+</template>
+
+<script>
+	import ContractForm from './ContractForm'
+	import ContactForm from './ContractForm'
+	import SelectTree from '@/components/treeSelect/treeSelect.vue'
+	import areaService from "@/api/sys/areaService";
+	import SelectUserTree from '@/views/utils/treeUserSelect'
+	import ProjectInfoService from "@/api/jy/ProjectInfoService";
+	import UpLoadComponent from '@/views/common/UpLoadComponent'
+  export default {
+    props: {
+      businessId: {
+        type: String,
+        default: ''
+      },
+      formReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      status: {
+        type: String,
+        default: ''
+      }
+    },
+    data () {
+      return {
+		  title: '',
+		  method: '',
+		  visible: false,
+		  loading: false,
+		  typeDictList: [],
+		  activeName: 'programDetail',
+		  inputForm: {
+			  id: '', // 主键值（新增不传，修改必传）
+			  no: '', // 编号（新增不传，修改必传）
+			  contractId: '', // 合同id
+			  contractName: '', // 合同名称
+			  client: '', // 委托方
+			  clientName: '', // 委托方名称
+			  amount: '', // 合同金额
+			  contractType: '', // 合同类别
+			  name: '', // 项目名称
+			  projectPlace: '', // 项目所在地
+			  status: '', // 状态
+			  procInsId: '', // 流程id
+			  processDefinitionId: '', // 流程信息
+			  members: [], // 成员列表
+			  files: [], // 附件信息
+			  contractStatus: '',//合同情况
+			  contractType:'',//合同类型(小类)
+			  contractTypeFirst:'', //合同类型(大类)
+			  buildPlace:'', // 建设地点
+			  createByName:this.$store.state.user.name, //创建人
+			  createDate:this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), //创建时间
+			  projectOverview:'', //工程概况
+			  special:'', //特殊要求
+			  projectLeader:'', //项目负责人
+			  clientList:[], //委托方联系人
+			  files: [], // 附件信息
+		  },
+		  clientTypes: [
+			  {value: 1, label: '委托人'},
+			  {value: 2, label: '项目对接人'}
+		  ],
+		  auditId1: '',
+		  auditId2: '',
+		  auditId3: '',
+		  archiveId: '',
+		  provience:'',
+		  city:'',
+		  con:''
+      }
+    },
+	  ProjectInfoService:null,
+    created () {
+		this.projectInfoService=new ProjectInfoService()
+		this.getLocation()
+    },
+    computed: {
+      bus: {
+        get () {
+          this.$refs.uploadComponent.setDividerName('附件')
+          return this.businessId
+        },
+        set (val) {
+          this.businessId = val
+        }
+      }
+    },
+    components: {
+		ContractForm,
+		ContactForm,
+		SelectTree,
+		SelectUserTree,
+		UpLoadComponent,
+    },
+    methods: {
+		getKeyWatch (keyWatch) {
+			this.keyWatch = keyWatch
+		},
+		openContractForm () {
+			if (!this.commonJS.isEmpty(this.inputForm.contractId)) {
+				this.$refs.contractForm.init(this.inputForm.contractId)
+			} else {
+				this.$refs.contractForm.init()
+			}
+		},
+		getContract (row) {
+			console.log('row',row)
+			let _this = this
+			// eslint-disable-next-line no-unused-vars
+			let _list = row
+			let _num = 0
+			if (this.commonJS.isEmpty(this.inputForm.clientList)) {
+				this.inputForm.clientList = []
+			}
+			const waitForEach = function () {
+				return new Promise(function (resolve, reject) {
+					if (_this.commonJS.isEmpty(_this.inputForm.clientList)) {
+						resolve()
+					} else {
+						_this.inputForm.clientList.forEach((client, index) => {
+							if (_this.inputForm.customerNo === client.no) {
+								_this.$refs.contactTable.remove(client)
+								_this.inputForm.clientList.splice(index, 1)
+							}
+						})
+						setTimeout(() => {
+							resolve()
+						}, 400)
+					}
+				})
+			}
+			waitForEach().then(() => {
+				this.inputForm.contractId = row.id // 合同id
+				this.inputForm.contractName = row.name // 合同名称
+				this.inputForm.clientName = row.clientName // 委托方名称
+				this.inputForm.contractType = row.contractType // 合同类型(小类)
+				this.inputForm.contractTypeFirst = row.contractTypeFirst // 合同类型(大类)
+				const wait = function () {
+					return new Promise(function (resolve, reject) {
+						_this.inputForm.clientList.forEach(client => {
+							if (_list.no === client.no) {
+								_num = 1
+							}
+						})
+						setTimeout(() => {
+							resolve()
+						}, 100)
+					})
+				}
+				wait().then(() => {
+					if (_num === 0) {
+						this.inputForm.clientList.push({ name: row.linkmanList[0].name,id: row.linkmanList[0].id})
+						this.$refs.clientTable.insertAt({name: row.linkmanList[0].name,id: row.linkmanList[0].id,linkPhone:row.linkmanList[0].linkPhone,linkMobile:row.linkmanList[0].linkMobile,position:row.linkmanList[0].position})
+						this.clientTableKey = Math.random()
+					}
+				})
+			})
+			this.$forceUpdate()
+			console.log('list',this.inputForm.clientList)
+		},
+		//获取省市县
+		getLocation(){
+			var locationId=this.inputForm.projectPlace
+			console.log('id',locationId)
+			areaService.getParent(locationId).then((data)=>{
+				if (!data){
+					return
+				}
+				console.log('da',data)
+				this.provience=data[2]
+				this.city=data[3]
+				this.con=data[4]
+
+			})
+		},
+		//委托方联系人
+		openContactForm(){
+			if (this.commonJS.isEmpty(this.inputForm.clientList)) {
+				this.$refs.contractForm.init()
+			}
+		},
+		//添加委托方联系人
+		getContact(row){
+			this.inputForm.clientList.push({name: row.linkmanList[0].name,id: row.linkmanList[0].id})
+			this.$refs.clientTable.insertAt({name: row.linkmanList[0].name,id: row.linkmanList[0].id,linkPhone:row.linkmanList[0].linkPhone,linkMobile:row.linkmanList[0].linkMobile,position:row.linkmanList[0].position})
+			this.clientTableKey = Math.random()
+		},
+		// 删除
+		removeEvent (row, rowIndex, type) {
+			if (type === 'member') {
+				this.$refs.memberTable.remove(row)
+				this.inputForm.members.splice(rowIndex, 1)
+			}
+			if (type === 'client') {
+				this.$refs.clientTable.remove(row)
+				this.inputForm.clientList.splice(rowIndex, 1)
+			}
+		},
+		init (method, id) {
+			this.method = method
+			// console.log('method', method)
+			this.inputForm = {
+				id: '', // 主键值（新增不传，修改必传）
+				no: '', // 编号（新增不传，修改必传）
+				contractId: '', // 合同id
+				contractName: '', // 合同名称
+				client: '', // 委托方
+				clientName: '', // 委托方名称
+				amount: '', // 合同金额
+				contractType: '', // 合同类别
+				name: '', // 项目名称
+				projectPlace: '', // 项目所在地
+				status: '', // 状态
+				procInsId: '', // 流程id
+				processDefinitionId: '', // 流程信息
+				members: [], // 成员列表
+				files: [], // 附件信息
+				contractStatus: '',//合同情况
+				contractType:'',//合同类型(小类)
+				contractTypeFirst:'', //合同类型(大类)
+				buildPlace:'', // 建设地点
+				createByName:this.$store.state.user.name, //创建人
+				createDate: this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), //创建时间
+				projectOverview:'', //工程概况
+				special:'', //特殊要求
+				projectLeader:'', //项目负责人
+				clientList:[], //委托方联系人
+				files: [], // 附件信息
+			}
+			this.inputForm.id = id
+			if (method === 'add') {
+				// this.inputForm.id = 'add'
+				this.title = `新建项目`
+			} else if (method === 'edit') {
+				this.title = '修改项目'
+			} else if (method === 'view') {
+				this.title = '查看项目详情'
+			}
+			this.visible = true
+			this.loading = false
+			this.$nextTick(() => {
+				this.$refs.inputForm.resetFields()
+				this.loading = true
+				this.$refs.uploadComponent.clearUpload()
+				// this.$refs.archiveFile.clearUpload()
+				if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+					this.projectInfoService.findById(this.inputForm.id).then((data) => {
+						this.inputForm = this.recover(this.inputForm, data)
+						this.inputForm.members=data.projectMembers
+						this.inputForm.clientList=data.clientList
+						this.inputForm.createByName=data.createById
+						this.getLocation()
+						// this.inputForm.cwWorkClientContactDTOList=data.cwWorkClientContactDTOList
+						console.log('data', data)
+						if (this.commonJS.isEmpty(this.inputForm.createDate)) {
+							this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+						}
+						if (this.formReadOnly) {
+							method = 'view'
+						}
+						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'jyProject', null, null, null, null, false)
+						// this.$refs.archiveFile.newUpload('view', [], 'cwWorkContract', null, null, null, null, false)
+						this.loading = false
+					})
+				}
+			})
+		},
+		reapplyForm (callback) {
+			this.loading = true
+			this.programProjectListInfoService.queryById(this.inputForm.id).then((data) => {
+				if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+					this.loading = false
+					this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+					throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+				} else {
+					this.startFormTrue(callback)
+				}
+			})
+		},
+		saveForm (callback) {
+			this.doSubmit('save', callback)
+		},
+		startForm (callback) {
+			this.loading = true
+			if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+				this.projectInfoService.queryById(this.inputForm.id).then((data) => {
+					if (this.commonJS.isNotEmpty(data.status) && data.status !== '0' && data.status !== '1' && data.status !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+					} else {
+						this.startFormTrue(callback)
+					}
+				})
+			} else {
+				this.startFormTrue(callback)
+			}
+		},
+		startFormTrue (callback) {
+			this.doSubmit('startAndHold', callback)
+		},
+		agreeForm (callback) {
+			this.doSubmit('agree', callback)
+		},
+		// 表单提交
+		doSubmit (status, callback) {
+			this.loading = true
+			if (status === 'save') {
+				// 暂存
+				this.inputForm.status = '1'
+				this.loading = true
+				if (this.$refs.uploadComponent.checkProgress()) {
+					this.loading = false
+					return
+				}
+				this.inputForm.files = this.$refs.uploadComponent.getDataList()
+				this.projectInfoService.saveForm(this.inputForm).then((data) => {
+					callback(data.businessTable, data.businessId, this.inputForm)
+					this.loading = false
+				}).catch(() => {
+					this.loading = false
+				})
+				return
+			} else if (status === 'startAndHold') {
+				// 送审  待审核
+				this.inputForm.status = '2'
+			} else if (status === 'agree') {
+				// 审核同意
+				this.inputForm.status = '5'
+			}
+			if (this.commonJS.isEmpty(this.inputForm.clientList)) {
+				this.loading = false
+				this.$message.error('填写一条委托方联系人信息')
+				return
+			}
+			if (this.commonJS.isEmpty(this.inputForm.contractStatus)) {
+				this.loading = false
+				this.$message.error('请选择合同情况')
+				return
+			}
+			if (this.inputForm.contractStatus === '1' && this.inputForm.contractName === '') {
+				this.loading = false
+				this.$message.error('请选择合同')
+				return
+			}
+			if (this.commonJS.isEmpty(this.inputForm.projectPlace)) {
+				this.loading = false
+				this.$message.error('请选择项目所在地')
+				return
+			}
+			if (this.commonJS.isEmpty(this.inputForm.projectLeader)) {
+				this.loading = false
+				this.$message.error('请选择项目负责人')
+				return
+			}
+			this.$refs['inputForm'].validate((valid) => {
+				if (valid) {
+					this.loading = true
+					if (this.$refs.uploadComponent.checkProgress()) {
+						this.loading = false
+						return
+					}
+					console.log('this.inputForm', this.inputForm)
+					this.inputForm.files = this.$refs.uploadComponent.getDataList()
+					JSON
+					this.projectInfoService.saveForm(this.inputForm).then((data) => {
+						this.inputForm.id = data.businessId
+						callback(data.businessTable, data.businessId, this.inputForm)
+						this.loading = false
+					}).catch(() => {
+						this.loading = false
+					})
+				} else {
+					this.loading = false
+				}
+			})
+		},
+		async updateStatusById (type, callback) {
+			this.loading = true
+			if (await this.$refs.uploadComponent.checkProgress()) {
+				this.loading = false
+				throw new Error()
+			} else {
+				if (type === 'reject' || type === 'reback') {
+					this.programProjectListInfoService.queryById(this.inputForm.id).then((data) => {
+						if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// if (type === 'agree') {
+							//   // 同意
+							//   this.inputForm.status = '5'
+							// }
+							if (type === 'reject') {
+								// 驳回
+								this.inputForm.status = '4'
+							}
+							if (type === 'reback') {
+								// 撤回
+								this.inputForm.status = '3'
+							}
+							if (type === 'reject' || type === 'reback') {
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.programProjectListInfoService.updateStatusById(param).then(() => {
+									this.loading = false
+									callback()
+								})
+							}
+						}
+					})
+				} else if (type === 'hold') {
+					this.programProjectListInfoService.queryById(this.inputForm.id).then((data) => {
+						if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// 终止
+							let param = {status: '1', id: this.inputForm.id}
+							this.programProjectListInfoService.updateStatusById(param).then(() => {
+								this.loading = false
+								callback()
+							})
+						}
+					})
+				}
+			}
+		},
+		close () {
+			this.inputForm = {
+				id: '', // 主键值（新增不传，修改必传）
+				no: '', // 编号（新增不传，修改必传）
+				contractId: '', // 合同id
+				contractName: '', // 合同名称
+				client: '', // 委托方
+				clientName: '', // 委托方名称
+				amount: 0, // 合同金额
+				contractType: '', // 合同类型
+				name: '', // 项目名称
+				projectType: '', // 项目类别
+				projectMould: '', // 项目类型
+				company: '', // 执业机构
+				propertyHolder: '', // 产权持有人
+				propertyHolderName: '', // 产权持有人姓名
+				location: '', // 项目所在地
+				isFirst: '', // 是否首次承建
+				yearNum: '', // 承做年数
+				checkYear: '', // 评估费用核算年度
+				projectManager: '', // 项目经理
+				projectManagerName: '', // 项目经理名称
+				reportType: '', // 报告类型
+				industry: '', // 所属行业
+				enterpriseType: '', // 企业类型
+				riskLevel: '', // 风险等级
+				generateReportNumber: '', // 是否生成报告号
+				projectSource: '', // 项目来源
+				estimate: 0, // 预估收入（元）
+				planEndTime: '', // 计划完成时间
+				useNum: 0, // 计划使用人数
+				appointment: 0, // 约定书（份）
+				workHours: 0, // 预算工时
+				remarks: '', // 备注
+				assessmentEnterprise: '', // 被评估企业
+				assessmentEnterpriseName: '', // 被评估企业名称
+				linkNum: '', // 联系人及电话
+				relationship: '', // 委托人与被评估单位关系
+				assessmentWay: '', // 评估方式
+				assessmentObjective: '', // 评估目的
+				assessmentDate: '', // 评估基准日
+				num: '', // 评估服务收费总额
+				projectDevelopment: '', // 项目开发人
+				delegateProjectType: '', // 项目类型
+				assessmentObject: '', // 评估对象
+				assessmentRange: '', // 评估范围
+				workBeginAndEndDate: [], // 预计现场工作起止时间
+				workBeginDate: '', // 预计现场工作开始时间
+				workEndDate: '', // 预计现场工作结束时间
+				reportingDate: '', // 预计出报告日期
+				isHave: '', // 本所是否具备承接胜任能力
+				isInfluence: '', // 是否影响本所乘坐人员独立性
+				mode: '', // 项目承接方式
+				status: '', // 状态
+				procInsId: '', // 流程id
+				processDefinitionId: '', // 流程信息
+				links: [], // 联系人列表
+				members: [], // 成员列表
+				files: [], // 附件信息
+			}
+			this.$refs.uploadComponent.clearUpload()
+			this.$refs.inputForm.resetFields()
+			this.visible = false
+		},
+		uploadVideoProcess (event, file, fileList) {
+			this.progressFlag = true // 显示进度条
+			this.loadProgress = parseInt(event.percent) // 动态获取文件上传进度
+			if (this.loadProgress >= 100) {
+				this.loadProgress = 100
+				setTimeout(() => { this.progressFlag = false }, 1000) // 一秒后关闭进度条
+			}
+		},
+    }
+  }
+</script>
+<style lang="scss">
+  .el-input-number .el-input__inner {
+    text-align: left;
+  }
+  .el-divider__text {
+    font-size: 16px;
+    font-weight: bold;
+  }
+
+</style>

src/views/jy/project/ProjectForm.vue

@@ -0,0 +1,879 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+	<div>
+		<el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
+				 label-width="170px" @submit.native.prevent>
+
+			<el-row  :gutter="15">
+				<el-col :span="24">
+					<el-form-item label="合同情况:" prop="contractStatus"
+								  :rules="[
+							   {required: true, message:'请选择合同情况', trigger:'blur'}
+                 ]">
+						<el-radio-group v-model="inputForm.contractStatus" class="ml-4">
+							<el-radio label="1" size="large">有合同</el-radio> <el-radio label="0" size="large">无合同</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-row  :gutter="15" v-show="inputForm.contractStatus === '1'">
+					<el-col :span="24" >
+						<el-divider content-position="left"><i class="el-icon-document"></i> 选择合同</el-divider>
+						<el-form-item label="选择合同" prop="contractName"
+									  :rules="[
+                          {required: true, message:'合同不能为空', trigger:'blur'},
+                          {required: true, message:'合同不能为空', trigger:'change'}
+                 ]">
+							<el-input size="large" :readonly="true" @focus="openContractForm()" v-model="inputForm.contractName" placeholder="请选择合同">
+								<el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="合同名称" prop="contractName"
+									  :rules="[
+                 ]">
+							<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="合同金额(元)" prop="amount"
+									  :rules="[
+                 ]">
+							<!--              <el-input v-model="inputForm.amount" placeholder="请填写合同金额"></el-input>-->
+							<el-input-number
+								:disabled="true"
+								v-model="inputForm.amount"
+								controls-position="right"
+								:controls="false"
+								style="width:100%;"
+								:precision="2"
+								placeholder="请填写合同金额"
+								:step="0.01"
+								:min="0"
+								clearable>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="委托方" prop="clientName"
+									  :rules="[
+                 ]">
+							<el-input :disabled="true" v-model="inputForm.clientName" placeholder="请填写委托方"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
+									  :rules="[
+                 ]">
+							<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="合同类型(小类)" prop="contractType"
+									  :rules="[
+                 ]">
+							<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+			</el-row>
+			<el-divider content-position="left"><i class="el-icon-document"></i> 项目基本情况信息</el-divider>
+			<el-row  :gutter="15">
+				<el-col :span="12">
+					<el-form-item label="项目名称" prop="name"
+								  :rules="[
+                          {required: true, message:'项目名称不能为空', trigger:'blur'}
+                 ]">
+						<el-input maxlength="64" v-model="inputForm.name" placeholder="请输入项目名称" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目所在地" prop="projectPlace"
+								  :rules="[
+                          {required: true, message:'项目所在地不能为空', trigger:'change'}
+                 ]">
+						<SelectTree
+							ref="areaTree"
+							:props="{
+                      value: 'id',             // ID字段名
+                      label: 'name',         // 显示名称
+                      children: 'children'    // 子级字段名
+                    }"
+							url="/system-server/sys/area/treeData"
+							:value="inputForm.projectPlace"
+							:clearable="true"
+							size="large"
+							:accordion="true"
+							@getValue="(value) => {inputForm.projectPlace=value}"
+							@click="getLocation"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="所在省份" prop="provience"
+								  :rules="[
+                 ]">
+						<el-input :disabled="true" v-model="provience" placeholder="请输入所在省份" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="所在地级市" prop="city"
+								  :rules="[
+                 ]">
+						<el-input :disabled="true" v-model="city" placeholder="请输入所在地级市" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="所在区县" prop="con"
+								  :rules="[
+                 ]">
+						<el-input :disabled="true" v-model="con" placeholder="请输入所在区县" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="建设地点" prop="buildPlace"
+								  :rules="[
+                 ]">
+						<el-input  v-model="inputForm.buildPlace" placeholder="请输入建设地点" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="项目负责人" prop="projectLeader"
+								  :rules="[
+                          {required: true, message:'项目负责人不能为空', trigger:'change'}
+                 ]">
+						<SelectUserTree
+							ref="companyTree"
+							size="large"
+							:props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+							:url="`/system-server/sys/user/treeUserDataJyOffice?type=2`"
+							:value="inputForm.projectLeader"
+							:clearable="true"
+							:accordion="true"
+							@getValue="(value) => {inputForm.projectLeader=value}"/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建人" prop="createByName"
+								  :rules="[
+                   ]">
+						<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="创建时间" prop="createDate"
+								  :rules="[
+                   ]">
+						<el-input :disabled="true" v-model="inputForm.createDate" placeholder="请填写创建时间" clearable></el-input>
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24">
+					<el-form-item label="工程概况" prop="projectOverview"
+								  :rules="[
+                 ]">
+						<el-input type="textarea" v-model="inputForm.projectOverview" maxlength="500" placeholder="请输入工程概况" show-word-limit></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="特殊要求" prop="special"
+								  :rules="[
+                 ]">
+						<el-input type="textarea" v-model="inputForm.special" maxlength="500" placeholder="请输入特殊要求" show-word-limit></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-divider content-position="left"><i class="el-icon-document"></i>
+				<span><span style="color: red;border-top: 20px">*</span>委托方联系人信息</span>
+				<el-button style="margin-left: 20px" type="primary" :disabled="this.inputForm.contractStatus === '1'" size="default" @click="openContactForm()" plain>
+					新增
+				</el-button>
+			</el-divider>
+			<el-row  :gutter="15" >
+				<el-col :span="24">
+					<vxe-table
+						border
+						show-overflow
+						ref="clientTable"
+						class="vxe-table-element"
+						:data="inputForm.clientList"
+						style="margin-left: 5em"
+						:key="clientTableKey"
+						:edit-rules="validRulesClient"
+						highlight-current-row
+						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon: '#'}"
+					>
+						<vxe-table-column field="name" title="联系人" :edit-render="{}"  align="center">
+							<template v-slot:edit="scope">
+								<el-input :disabled="true" v-model="scope.row.name" ></el-input>
+							</template>
+						</vxe-table-column>
+						<!--					<vxe-table-column  align="center" field="clientType" title="人员类型" :edit-render="{name: '$select', options: clientTypes}">-->
+						<!--						<template v-slot:edit="scope">-->
+						<!--							<vxe-select :disabled="status === 'audit' || status === 'taskFormDetail'" v-model="scope.row.clientType"  transfer>-->
+						<!--								<vxe-option-->
+						<!--									v-for="item in clientTypes"-->
+						<!--									:key="item.value"-->
+						<!--									:value="item.value"-->
+						<!--									:label="item.label">-->
+						<!--								</vxe-option>-->
+						<!--							</vxe-select>-->
+						<!--						</template>-->
+						<!--					</vxe-table-column>-->
+						<vxe-table-column  align="center" field="linkPhone" title="联系方式1" :edit-render="{}">
+							<template v-slot:edit="scope">
+								<el-input :disabled="true" v-model="scope.row.linkPhone" ></el-input>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column  align="center" field="linkMobile" title="联系方式2" :edit-render="{}">
+							<template v-slot:edit="scope">
+								<el-input :disabled="true" v-model="scope.row.linkMobile" ></el-input>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column  align="center" field="position" title="职位" :edit-render="{}">
+							<template v-slot:edit="scope">
+								<el-input :disabled="true" v-model="scope.row.position" ></el-input>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column  align="center" title="操作" width="100">
+							<template v-slot="scope">
+								<el-button size="large" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'client')">删除</el-button>
+							</template>
+						</vxe-table-column>
+					</vxe-table>
+				</el-col>
+			</el-row>
+			<el-row  :gutter="15" v-show=" method==='view' || status ==='audit' ">
+				<el-col :span="24">
+					<el-divider content-position="left"><i class="el-icon-document"></i>
+						项目组成员
+					</el-divider>
+					<el-row  :gutter="15">
+						<el-col :span="24">
+							<vxe-table
+								border
+								show-footer
+								show-overflow
+								:footer-method="footerMethod"
+								ref="memberTable"
+								class="vxe-table-element"
+								:key="memberKey"
+								:data="inputForm.members"
+								style="margin-left: 5em"
+								@cell-click=""
+								:edit-rules="validRulesMember"
+								@edit-closed=""
+								highlight-current-row
+								:edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear:  status === 'audit' || status === 'taskFormDetail' ? true : false, icon: '#'}"
+							>
+								<vxe-table-column field="name" title="姓名" :edit-render="{name: '$input'}" align="center">
+									<template v-slot:edit="scope">
+										<vxe-input v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId) || status === 'audit' || status === 'taskFormDetail'"  style="width: 100%">
+											<template #suffix>
+												<el-button :disabled="status === 'audit' || status === 'taskFormDetail'"  @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></el-button>
+											</template>
+										</vxe-input>
+									</template>
+								</vxe-table-column>
+								<vxe-table-column field="workHours" title="预计工时（时）" :edit-render="{name: '$input'}"  align="center">
+									<template v-slot:edit="scope">
+										<vxe-input
+											:disabled="status === 'audit' || status === 'taskFormDetail'"
+											v-model="scope.row.workHours"
+											type="float"
+											digits="1"
+											placeholder="请输入预计工时（时）"
+											clearable>
+										</vxe-input>
+									</template>
+								</vxe-table-column>
+								<vxe-table-column  align="center" field="type" title="人员类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('program_registered_member_type')}">
+									<template v-slot:edit="scope">
+										<vxe-select :disabled="status === 'audit' || status === 'taskFormDetail'" v-model="scope.row.type" placeholder="请选择人员类型" clearable style="width: 100%;" transfer>
+											<vxe-option
+												v-for="item in $dictUtils.getDictList('program_registered_member_type')"
+												:key="item.value"
+												:label="item.label"
+												:value="item.value">
+											</vxe-option>
+										</vxe-select>
+									</template>
+								</vxe-table-column>
+								<vxe-table-column align="center" field="job" title="项目职务" :edit-render="{name: '$select', options: $dictUtils.getDictList('program_registered_member_position')}">
+									<template v-slot:edit="scope">
+										<vxe-select :disabled="status === 'audit' || status === 'taskFormDetail'" v-model="scope.row.job" placeholder="请选择项目职务" clearable style="width: 100%;" transfer>
+											<vxe-option
+												v-for="item in $dictUtils.getDictList('program_registered_member_position')"
+												:key="item.value"
+												:label="item.label"
+												:value="item.value">
+											</vxe-option>
+										</vxe-select>
+									</template>
+								</vxe-table-column>
+								<vxe-table-column align="center" title="操作" width="100">
+									<template v-slot="scope">
+										<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'member')">删除</el-button>
+									</template>
+								</vxe-table-column>
+							</vxe-table>
+						</el-col>
+					</el-row>
+				</el-col>
+			</el-row>
+		</el-form>
+		<!--        附件-->
+		<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+		<ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
+		<ContactForm  ref="contactForm" @getContract="getContact"></ContactForm>
+
+	</div>
+</template>
+
+<script>
+	import ContractForm from './ContractForm'
+	import ContactForm from './ContractForm'
+	import SelectTree from '@/components/treeSelect/treeSelect.vue'
+	import areaService from "@/api/sys/areaService";
+	import SelectUserTree from '@/views/utils/treeUserSelect'
+	import ProjectInfoService from "@/api/jy/ProjectInfoService";
+	import UpLoadComponent from '@/views/common/UpLoadComponent'
+
+	export default {
+		props: {
+			businessId: {
+				type: String,
+				default: ''
+			},
+			formReadOnly: {
+				type: Boolean,
+				default: false
+			},
+			status: {
+				type: String,
+				default: ''
+			}
+		},
+		data () {
+			return {
+				title: '',
+				method: '',
+				loading: false,
+				typeDictList: [],
+				inputForm: {
+					id: '', // 主键值（新增不传，修改必传）
+					no: '', // 编号（新增不传，修改必传）
+					contractId: '', // 合同id
+					contractName: '', // 合同名称
+					client: '', // 委托方
+					clientName: '', // 委托方名称
+					amount: '', // 合同金额
+					contractType: '', // 合同类别
+					name: '', // 项目名称
+					projectPlace: '', // 项目所在地
+					status: '', // 状态
+					procInsId: '', // 流程id
+					processDefinitionId: '', // 流程信息
+					members: [], // 成员列表
+					files: [], // 附件信息
+					contractStatus: '',//合同情况
+					contractType:'',//合同类型(小类)
+					contractTypeFirst:'', //合同类型(大类)
+					buildPlace:'', // 建设地点
+					createByName:this.$store.state.user.name, //创建人
+					createDate: this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), //创建时间
+					projectOverview:'', //工程概况
+					special:'', //特殊要求
+					projectLeader:'', //项目负责人
+					clientList:[], //委托方联系人
+					files: [], // 附件信息
+				},
+				clientTypes: [
+					{value: '1', label: '委托人'},
+					{value: '2', label: '项目对接人'}
+				],
+				keyWatch: '',
+				clientTableKey: 'default',
+				tableIndex: '',
+				memberKey: '',
+				validRulesMember: {
+					name: [
+						{required: true, message: '姓名不能为空'}
+					]
+				},
+				validRulesClient: {
+					clientType: [
+						{required: true, message: '人员类型不能为空'}
+					]
+				},
+				provience:'',
+				city:'',
+				con:''
+			}
+		},
+		ProjectInfoService:null,
+		created () {
+			this.projectInfoService=new ProjectInfoService()
+		},
+		computed: {
+			bus: {
+				get () {
+					this.$refs.uploadComponent.setDividerName('附件')
+					return this.businessId
+				},
+				set (val) {
+					this.businessId = val
+				}
+			}
+		},
+		watch: {
+			'keyWatch': {
+				handler (newVal) {
+					if (this.bus) {
+						if (this.bus !== 'false') {
+							this.init('', this.bus)
+						}
+					} else {
+						this.$nextTick(() => {
+							this.$refs.inputForm.resetFields()
+						})
+					}
+				}
+			},
+			'loading': {
+				handler (newVal) {
+					this.$emit('changeLoading', newVal)
+					this.$refs.uploadComponent.changeLoading(newVal)
+				}
+			}
+		},
+		components: {
+			ContractForm,
+			ContactForm,
+			SelectTree,
+			SelectUserTree,
+			UpLoadComponent,
+		},
+		methods: {
+			getKeyWatch (keyWatch) {
+				this.keyWatch = keyWatch
+			},
+			init (method, id) {
+				this.method = method
+				console.log('method', method)
+				this.inputForm = {
+					id: '', // 主键值（新增不传，修改必传）
+					no: '', // 编号（新增不传，修改必传）
+					contractId: '', // 合同id
+					contractName: '', // 合同名称
+					client: '', // 委托方
+					clientName: '', // 委托方名称
+					amount: '', // 合同金额
+					contractType: '', // 合同类别
+					name: '', // 项目名称
+					projectPlace: '', // 项目所在地
+					status: '', // 状态
+					procInsId: '', // 流程id
+					processDefinitionId: '', // 流程信息
+					members: [], // 成员列表
+					files: [], // 附件信息
+					contractStatus: '',//合同情况
+					contractType:'',//合同类型(小类)
+					contractTypeFirst:'', //合同类型(大类)
+					buildPlace:'', // 建设地点
+					createByName:this.$store.state.user.name, //创建人
+					createDate: this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), //创建时间
+					projectOverview:'', //工程概况
+					special:'', //特殊要求
+					projectLeader:'', //项目负责人
+					clientList:[], //委托方联系人
+					files: [], // 附件信息
+				}
+				this.inputForm.id = id
+				if (method === 'add') {
+					// this.inputForm.id = 'add'
+					this.title = `新建项目`
+				} else if (method === 'edit') {
+					this.title = '修改项目'
+				} else if (method === 'view') {
+					this.title = '查看项目详情'
+				}
+				this.loading = false
+				this.$nextTick(() => {
+					this.$refs.inputForm.resetFields()
+					this.loading = true
+					this.$refs.uploadComponent.clearUpload()
+					// this.$refs.archiveFile.clearUpload()
+					if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+						this.projectInfoService.findById(this.inputForm.id).then((data) => {
+							console.log(1231231)
+							this.inputForm = this.recover(this.inputForm, data)
+							this.inputForm.members=data.projectMembers
+							this.inputForm.clientList=data.clientList
+							this.inputForm.createByName=data.createById
+							this.inputForm.createDate=data.createTime
+							this.getLocation()
+							// this.inputForm.cwWorkClientContactDTOList=data.cwWorkClientContactDTOList
+							console.log('data', data)
+							if (this.commonJS.isEmpty(this.inputForm.createDate)) {
+								this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+							}
+							if (this.formReadOnly) {
+								method = 'view'
+							}
+							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'jyProject', null, null, null, null, false)
+							// this.$refs.archiveFile.newUpload('view', [], 'cwWorkContract', null, null, null, null, false)
+							this.loading = false
+						})
+					}
+				})
+			},
+			openContractForm () {
+				if (!this.commonJS.isEmpty(this.inputForm.contractId)) {
+					this.$refs.contractForm.init(this.inputForm.contractId)
+				} else {
+					this.$refs.contractForm.init()
+				}
+			},
+			getContract (row) {
+				console.log('row',row)
+				let _this = this
+				// eslint-disable-next-line no-unused-vars
+				let _list = row
+				let _num = 0
+				if (this.commonJS.isEmpty(this.inputForm.clientList)) {
+					this.inputForm.clientList = []
+				}
+				const waitForEach = function () {
+					return new Promise(function (resolve, reject) {
+						if (_this.commonJS.isEmpty(_this.inputForm.clientList)) {
+							resolve()
+						} else {
+							_this.inputForm.clientList.forEach((client, index) => {
+								if (_this.inputForm.customerNo === client.no) {
+									_this.$refs.contactTable.remove(client)
+									_this.inputForm.clientList.splice(index, 1)
+								}
+							})
+							setTimeout(() => {
+								resolve()
+							}, 400)
+						}
+					})
+				}
+				waitForEach().then(() => {
+					this.inputForm.contractId = row.id // 合同id
+					this.inputForm.contractName = row.name // 合同名称
+					this.inputForm.clientName = row.clientName // 委托方名称
+					this.inputForm.contractType = row.contractType // 合同类型(小类)
+					this.inputForm.contractTypeFirst = row.contractTypeFirst // 合同类型(大类)
+					const wait = function () {
+						return new Promise(function (resolve, reject) {
+							_this.inputForm.clientList.forEach(client => {
+								if (_list.no === client.no) {
+									_num = 1
+								}
+							})
+							setTimeout(() => {
+								resolve()
+							}, 100)
+						})
+					}
+					wait().then(() => {
+						if (_num === 0) {
+							this.inputForm.clientList.push({ name: row.linkmanList[0].name,id: row.linkmanList[0].id})
+							this.$refs.clientTable.insertAt({name: row.linkmanList[0].name,id: row.linkmanList[0].id,linkPhone:row.linkmanList[0].linkPhone,linkMobile:row.linkmanList[0].linkMobile,position:row.linkmanList[0].position})
+							this.clientTableKey = Math.random()
+						}
+					})
+				})
+				this.$forceUpdate()
+				console.log('list',this.inputForm.clientList)
+			},
+			//获取省市县
+			getLocation(){
+				var locationId=this.inputForm.projectPlace
+				console.log('id',this.inputForm.projectPlace)
+				areaService.getParent(locationId).then((data)=>{
+					if (!data){
+						return
+					}
+					console.log('da',data)
+					this.provience=data[2]
+					this.city=data[3]
+					this.con=data[4]
+
+				})
+			},
+			//委托方联系人
+			openContactForm(){
+				if (this.commonJS.isEmpty(this.inputForm.clientList)) {
+					this.$refs.contractForm.init()
+				}
+			},
+			//添加委托方联系人
+			getContact(row){
+				this.inputForm.clientList.push({name: row.linkmanList[0].name,id: row.linkmanList[0].id})
+				this.$refs.clientTable.insertAt({name: row.linkmanList[0].name,id: row.linkmanList[0].id,linkPhone:row.linkmanList[0].linkPhone,linkMobile:row.linkmanList[0].linkMobile,position:row.linkmanList[0].position})
+				this.clientTableKey = Math.random()
+			},
+			// 删除
+			removeEvent (row, rowIndex, type) {
+				if (type === 'member') {
+					this.$refs.memberTable.remove(row)
+					this.inputForm.members.splice(rowIndex, 1)
+				}
+				if (type === 'client') {
+					this.$refs.clientTable.remove(row)
+					this.inputForm.clientList.splice(rowIndex, 1)
+				}
+			},
+			reapplyForm (callback) {
+				this.loading = true
+				this.projectInfoService.findById(this.inputForm.id).then((data) => {
+					if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+					} else {
+						this.startFormTrue(callback)
+					}
+				})
+			},
+			saveForm (callback) {
+				this.doSubmit('save', callback)
+			},
+			startForm (callback) {
+				this.loading = true
+				if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+					this.projectInfoService.findById(this.inputForm.id).then((data) => {
+						if (this.commonJS.isNotEmpty(data.status) && data.status !== '0' && data.status !== '1' && data.status !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						} else {
+							this.startFormTrue(callback)
+						}
+					})
+				} else {
+					this.startFormTrue(callback)
+				}
+			},
+			startFormTrue (callback) {
+				this.doSubmit('startAndHold', callback)
+			},
+			// 通过
+			agreeForm (callback) {
+				this.loading = true
+				this.$refs['inputForm'].validate(async (valid) => {
+					if (valid) {
+						await this.projectInfoService.findById(this.inputForm.id).then((data) => {
+							if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+								this.loading = false
+								this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+								throw new Error()
+							} else {
+								this.loading = true
+								this.inputForm.workAttachmentList = this.$refs.uploadComponent.getDataList()
+								if (this.$store.state.user.office.name ==='总经办'){
+									this.inputForm.status = '5'
+								}else {
+									this.inputForm.status = '2'
+								}
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.projectInfoService.updateStatusById(param).then((data) => {
+									callback(data.businessTable, data.businessId, this.inputForm)
+									this.$refs.inputForm.resetFields()
+									this.loading = false
+								}).catch(() => {
+									this.$refs.inputForm.resetFields()
+									this.loading = false
+								})
+							}
+						})
+					} else {
+						this.loading = false
+					}
+				})
+			},
+			// 表单提交
+			doSubmit (status, callback) {
+				this.loading = true
+				if (status === 'save') {
+					// 暂存
+					this.inputForm.status = '1'
+					this.loading = true
+					if (this.$refs.uploadComponent.checkProgress()) {
+						this.loading = false
+						return
+					}
+					this.inputForm.files = this.$refs.uploadComponent.getDataList()
+					this.projectInfoService.saveForm(this.inputForm).then((data) => {
+						callback(data.businessTable, data.businessId, this.inputForm)
+						this.loading = false
+					}).catch(() => {
+						this.loading = false
+					})
+					return
+				} else if (status === 'startAndHold') {
+					// 送审  待审核
+					this.inputForm.status = '2'
+				} else if (status === 'agree') {
+					// 审核同意
+					this.inputForm.status = '5'
+				}
+				if (this.commonJS.isEmpty(this.inputForm.clientList)) {
+					this.loading = false
+					this.$message.error('填写一条委托方联系人信息')
+					return
+				}
+				if (this.commonJS.isEmpty(this.inputForm.contractStatus)) {
+					this.loading = false
+					this.$message.error('请选择合同情况')
+					return
+				}
+				if (this.inputForm.contractStatus === '1' && this.inputForm.contractName === '') {
+					this.loading = false
+					this.$message.error('请选择合同')
+					return
+				}
+				if (this.commonJS.isEmpty(this.inputForm.projectPlace)) {
+					this.loading = false
+					this.$message.error('请选择项目所在地')
+					return
+				}
+				if (this.commonJS.isEmpty(this.inputForm.projectLeader)) {
+					this.loading = false
+					this.$message.error('请选择项目负责人')
+					return
+				}
+				this.$refs['inputForm'].validate((valid) => {
+					if (valid) {
+						this.loading = true
+						if (this.$refs.uploadComponent.checkProgress()) {
+							this.loading = false
+							return
+						}
+						console.log('this.inputForm', this.inputForm)
+						this.inputForm.files = this.$refs.uploadComponent.getDataList()
+						this.projectInfoService.saveForm(this.inputForm).then((data) => {
+							this.inputForm.id = data.businessId
+							callback(data.businessTable, data.businessId, this.inputForm)
+							this.loading = false
+						}).catch(() => {
+							this.loading = false
+						})
+					} else {
+						this.loading = false
+					}
+				})
+			},
+			async updateStatusById (type, callback) {
+				this.loading = true
+				if (await this.$refs.uploadComponent.checkProgress()) {
+					this.loading = false
+					throw new Error()
+				} else {
+					if (type === 'reject' || type === 'reback') {
+						this.projectInfoService.findById(this.inputForm.id).then((data) => {
+							if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+								this.loading = false
+								this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+								throw new Error()
+							} else {
+								// if (type === 'agree') {
+								//   // 同意
+								//   this.inputForm.status = '5'
+								// }
+								if (type === 'reject') {
+									// 驳回
+									this.inputForm.status = '4'
+								}
+								if (type === 'reback') {
+									// 撤回
+									this.inputForm.status = '3'
+								}
+								if (type === 'reject' || type === 'reback') {
+									let param = {status: this.inputForm.status, id: this.inputForm.id}
+									this.projectInfoService.updateStatusById(param).then(() => {
+										this.loading = false
+										callback()
+									})
+								}
+							}
+						})
+					} else if (type === 'hold') {
+						this.programProjectListInfoService.queryById(this.inputForm.id).then((data) => {
+							if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+								this.loading = false
+								this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+								throw new Error()
+							} else {
+								// 终止
+								let param = {status: '1', id: this.inputForm.id}
+								this.programProjectListInfoService.updateStatusById(param).then(() => {
+									this.loading = false
+									callback()
+								})
+							}
+						})
+					}
+				}
+			},
+			close () {
+				this.inputForm = {
+					id: '', // 主键值（新增不传，修改必传）
+					no: '', // 编号（新增不传，修改必传）
+					contractId: '', // 合同id
+					contractName: '', // 合同名称
+					client: '', // 委托方
+					clientName: '', // 委托方名称
+					amount: '', // 合同金额
+					contractType: '', // 合同类别
+					name: '', // 项目名称
+					projectPlace: '', // 项目所在地
+					status: '', // 状态
+					procInsId: '', // 流程id
+					processDefinitionId: '', // 流程信息
+					members: [], // 成员列表
+					files: [], // 附件信息
+					contractStatus: '',//合同情况
+					contractType:'',//合同类型(小类)
+					contractTypeFirst:'', //合同类型(大类)
+					buildPlace:'', // 建设地点
+					createByName:'', //创建人
+					createDate:'', //创建时间
+					projectOverview:'', //工程概况
+					special:'', //特殊要求
+					projectLeader:'', //项目负责人
+					clientList:[], //委托方联系人
+					files: [], // 附件信息
+				}
+				this.$refs.uploadComponent.clearUpload()
+				this.$refs.inputForm.resetFields()
+			},
+			uploadVideoProcess (event, file, fileList) {
+				this.progressFlag = true // 显示进度条
+				this.loadProgress = parseInt(event.percent) // 动态获取文件上传进度
+				if (this.loadProgress >= 100) {
+					this.loadProgress = 100
+					setTimeout(() => { this.progressFlag = false }, 1000) // 一秒后关闭进度条
+				}
+			},
+		}
+	}
+</script>
+<style lang="scss">
+	.el-input-number .el-input__inner {
+		text-align: left;
+	}
+	.el-divider__text {
+		font-size: 16px;
+		font-weight: bold;
+	}
+
+</style>

src/views/jy/project/ProjectList.vue

@@ -0,0 +1,666 @@
+<template>
+	<div class="page" >
+		<el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+			<!-- 搜索框-->
+			<el-form-item label="项目名称" prop="name">
+				<el-input v-model="searchForm.name" placeholder="请输入项目名称" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="项目编号" prop="no">
+				<el-input v-model="searchForm.no" placeholder="请输入项目编号" clearable></el-input>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="登记人" prop="createById">
+				<UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value) => {searchForm.createById = value}'></UserSelect>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="项目负责人" prop="projectManagerName">
+				<el-input v-model="searchForm.projectManagerName" placeholder="请输入项目负责人" clearable></el-input>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="合同名称" prop="contractName">
+				<el-input v-model="searchForm.contractName" placeholder="请输入合同名称" clearable></el-input>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="委托方" prop="clientName">
+				<el-input v-model="searchForm.clientName" placeholder="请输入委托方" clearable></el-input>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="创建时间" prop="createDates">
+				<el-date-picker
+					placement="bottom-start"
+					format="YYYY-MM-DD HH:mm:ss"
+					value-format="YYYY-MM-DD HH:mm:ss"
+					v-model="searchForm.createDates"
+					type="datetimerange"
+					range-separator="至"
+					start-placeholder="开始日期"
+					end-placeholder="结束日期">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="状态" prop="status">
+				<el-select v-model="searchForm.status" placeholder="请选择" style="width:100%;" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="一级校审状态" prop="status1">
+				<el-select v-model="searchForm.status1" placeholder="请选择" style="width:100%;" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="二级校审状态" prop="status2">
+				<el-select v-model="searchForm.status2" placeholder="请选择" style="width:100%;" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="三级校审状态" prop="status3">
+				<el-select v-model="searchForm.status3" placeholder="请选择" style="width:100%;" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="签发单状态" prop="issuedStatus">
+				<el-select v-model="searchForm.issuedStatus" placeholder="请选择" style="width:100%;" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('program_project_list_info_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="归档状态" prop="archiveStatus">
+				<el-select v-model="searchForm.archiveStatus" placeholder="请选择" style="width:100%;" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('program_project_archive_list_info_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
+
+			<el-form-item>
+				<el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
+				<el-button type="primary" @click="refreshList()" icon="el-icon-search">查询</el-button>
+				<el-button @click="resetSearch()" icon="el-icon-refresh-right">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<div class="jp-table" >
+			<vxe-toolbar ref="toolbarRef" :refresh="{query: refreshList}" export custom>
+				<template #buttons>
+					<!--          <el-button v-if="hasPermission('program:registered:add')" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>-->
+					<el-button v-if="hasPermission('jy_project:info:add')" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>
+					<el-button v-if="hasPermission('jy_project:info:del')" type="danger"   icon="el-icon-delete" @click="deleteAll()" :disabled="$refs.typeDictTable && $refs.typeDictTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+				</template>
+			</vxe-toolbar>
+			<div class="jp-table-body">
+				<vxe-table
+					border="inner"
+					auto-resize
+					resizable
+					height="auto"
+					:loading="loading"
+					size="small"
+					ref="typeDictTable"
+					show-header-overflow
+					show-overflow
+					highlight-hover-row
+					:menu-config="{}"
+					@sort-change="sortChangeHandle"
+					:export-config="{
+                    remote: true,
+                    filename: `嘉溢项目数据${moment(new Date()).format('YYYY-MM-DD')}`,
+                    sheetName: `嘉溢项目数据${moment(new Date()).format('YYYY-MM-DD')}`,
+                    exportMethod: exportMethod,
+                    types: ['xlsx'],
+                    modes: ['current', 'selected', 'all']
+                  }"
+					:sort-config="{remote:true}"
+					:data="dataList"
+					:tree-config="{}"
+					:checkbox-config="{}">
+					<vxe-column type="seq" width="60" title="序号"></vxe-column>
+					<vxe-column type="checkbox" width="50" ></vxe-column>
+					<vxe-column min-width="170" align="center" title="项目名称" field="name" >
+						<template #default="scope">
+							<el-link  type="primary" :underline="false" v-if="hasPermission('jy_project:info:view')" @click="view(scope.row)">{{scope.row.name}}</el-link>
+							<el-link  type="primary" :underline="false" v-else-if="hasPermission('jy_project:info:view')" @click="view(scope.row)">{{scope.row.name}}</el-link>
+							<span v-else>{{scope.row.name}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="100" align="center" title="项目编号" field="no"></vxe-column>
+					<vxe-column min-width="180" align="center" title="合同名称" field="contractName">
+						<template #default="scope">
+							<el-link  type="primary" :underline="false" v-if="hasPermission('jy_project:info:view')" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
+							<el-link  type="primary" :underline="false" v-else-if="hasPermission('jy_project:info:view')" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
+							<span v-else>{{scope.row.name}}</span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="100" align="center" title="负责人" field="projectLeader"></vxe-column>
+					<vxe-column min-width="180" align="center" title="主委托方" field="primaryLinkman"></vxe-column>
+					<vxe-column min-width="100" align="center" title="创建人" field="createById"></vxe-column>
+					<vxe-column min-width="120" align="center" title="创建日期" field="createTime"></vxe-column>
+
+					<vxe-column  min-width="150px" align="center" title="登记状态" field="status" >
+						<template #default="scope">
+							<el-button @click="registeredDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.status, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.status, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="120" align="center" title="一级校审" field="firstInstanceStatus">
+						<template #default="scope">
+							<el-button  @click="firstAuditDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.firstInstanceStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.firstInstanceStatus, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="120" align="center" title="二级校审" field="secondInstanceStatus">
+						<template #default="scope">
+							<el-button  @click="secondAuditDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.secondInstanceStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.secondInstanceStatus, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="120" align="center" title="三级校审" field="thirdInstanceStatus">
+						<template #default="scope">
+							<el-button  @click="thirdAuditDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.thirdInstanceStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.thirdInstanceStatus, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column  min-width="150px" align="center" title="报告签发" field="reportIssuance" >
+						<template #default="scope">
+							<el-button  @click="issuedDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.reportIssuance, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.reportIssuance, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="120" align="center" title="项目归档" field="revicewStatus">
+						<template #default="scope">
+							<el-button @click="archiveDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.revicewStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_archive_list_info_status", scope.row.revicewStatus, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="120" align="center" title="外审" field="outInstance">
+						<template #default="scope">
+							<el-button @click="archiveDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.outInstance, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_archive_list_info_status", scope.row.outInstance, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="120" align="center" title="报批签发" field="reportsSubmit">
+						<template #default="scope">
+							<el-button @click="archiveDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.reportsSubmit, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_archive_list_info_status", scope.row.reportsSubmit, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column title="操作" min-width="200px" fixed="right" align="center">
+						<template  #default="scope">
+							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary"  @click="registeredPush(scope.row)">修改</el-button>
+							<!--管理员角色登记完成后可修改-->
+							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && isAdmin" text type="primary"  @click="edit(scope.row.id)">修改</el-button>
+							<!--项目负责人修改-->
+							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && scope.row.projectLeader === $store.state.user.id" text type="primary"  @click="edit(scope.row.id)">修改</el-button>
+							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '2'&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary"  @click="registeredReback(scope.row)">撤回</el-button>
+							<!--项目登记  审核-->
+							<el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" text type="primary"   @click="examine(scope.row)">登记审核</el-button>
+							<!--项目登记  被驳回后当前申请人重新调整-->
+							<el-button v-if="hasPermission('jy_project:info:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status === '4'" text type="primary"   @click="adjust(scope.row)">驳回调整</el-button>
+
+							<el-button v-if="hasPermission('jy_project:info:del')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary"  @click="del(scope.row.id)">删除</el-button>
+							<!--管理员角色登记完成后可删除-->
+							<el-button v-if="hasPermission('jy_project:info:del')&&scope.row.status === '5' && isAdmin" text type="primary"  @click="del(scope.row.id)">删除</el-button>
+
+							<!--              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo) && scope.row.createBy === $store.state.user.id" text type="primary"  @click="saveReportNo(scope.row.id)">生成报告号</el-button>-->
+
+<!--							&lt;!&ndash; 一级校审  发起&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3')" text type="primary"  @click="firstAuditPush(scope.row)">一级校审</el-button>-->
+<!--							&lt;!&ndash; 一级校审  撤回&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary"  @click="firstAuditReback(scope.row)">校审撤回</el-button>-->
+<!--							&lt;!&ndash; 一级校审  审核&ndash;&gt;-->
+<!--							<el-button v-if="scope.row.status1==='2' && checkIsAuditFirst(scope.row)" text type="primary"   @click="examineFirst(scope.row)">一级校审审核</el-button>-->
+<!--							&lt;!&ndash; 一级校审  被驳回后当前申请人重新调整&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status1 === '4'" text type="primary"   @click="adjustFirst(scope.row)">驳回调整</el-button>-->
+
+<!--							&lt;!&ndash; 二级校审  发起&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status1 === '5'&&(scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3')" text type="primary"  @click="secondAuditPush(scope.row)">二级校审</el-button>-->
+<!--							&lt;!&ndash; 二级校审  撤回&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&scope.row.status2 === '2'&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" type="text"  @click="secondAuditReback(scope.row)">校审撤回</el-button>-->
+<!--							&lt;!&ndash; 二级校审  审核&ndash;&gt;-->
+<!--							<el-button v-if="scope.row.status2==='2' && checkIsAuditSecond(scope.row)" text type="primary"  @click="examineSecond(scope.row)">二级校审审核</el-button>-->
+<!--							&lt;!&ndash; 二级校审  被驳回后当前申请人重新调整&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status2 === '4'" text type="primary"  @click="adjustSecond(scope.row)">驳回调整</el-button>-->
+
+<!--							&lt;!&ndash; 三级校审  发起&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status2 === '5' &&(scope.row.status3 === '0'||scope.row.status3 === '1'||scope.row.status3 === '3')" text type="primary"  @click="thirdAuditPush(scope.row)">三级校审</el-button>-->
+<!--							&lt;!&ndash; 三级校审  撤回&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status3 === '2'" text type="primary"  @click="thirdAuditReback(scope.row)">校审撤回</el-button>-->
+<!--							&lt;!&ndash; 三级校审  审核&ndash;&gt;-->
+<!--							<el-button v-if="scope.row.status3==='2' && checkIsAuditThird(scope.row)" text type="primary"   @click="examineThird(scope.row)">三级校审审核</el-button>-->
+<!--							&lt;!&ndash; 三级校审  被驳回后当前申请人重新调整&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status3 === '4'" text type="primary"   @click="adjustThird(scope.row)">驳回调整</el-button>-->
+
+<!--							&lt;!&ndash;三神结束后，评估报告签发前进行资产评估项目（校对）&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:proo')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status3 === '5'&&scope.row.issuedStatus === '0'" text type="primary"  @click="proofread(scope.row.id)">校对</el-button>-->
+<!--							&lt;!&ndash;报告签发&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:browse')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id)) &&scope.row.status3 === '5' && (scope.row.issuedStatus === null ||scope.row.issuedStatus === undefined ||scope.row.issuedStatus === '' ||scope.row.issuedStatus === '0' || scope.row.issuedStatus === '1' || scope.row.issuedStatus === '3')" text type="primary"  @click="issued(scope.row)">签发</el-button>-->
+<!--							&lt;!&ndash;报告签发撤回&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:browse')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id)) && scope.row.issuedStatus === '2'" text type="primary"  @click="issuedReback(scope.row)">签发撤回</el-button>-->
+<!--							&lt;!&ndash; 报告签发  审核&ndash;&gt;-->
+<!--							<el-button v-if="scope.row.issuedStatus==='2' && checkIsAuditIssued(scope.row)" text type="primary"  @click="examineIssued(scope.row)">签发审核</el-button>-->
+<!--							&lt;!&ndash; 报告签发  被驳回后当前申请人重新调整&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:browse')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.issuedStatus === '4'" text type="primary"  @click="adjustIssued(scope.row)">驳回调整</el-button>-->
+
+<!--							&lt;!&ndash;评估报告装订后的审核&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:browse')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.issuedStatus === '5'&&scope.row.archiveStatus === '0'" text type="primary" @click="browse(scope.row.id)">装订自校</el-button>-->
+
+<!--							&lt;!&ndash; 项目归档&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.issuedStatus === '5' &&(scope.row.archiveStatus === '0'||scope.row.archiveStatus === '1'||scope.row.archiveStatus === '3'||scope.row.archiveStatus === '6')" text type="primary" @click="archivePush(scope.row)">项目归档</el-button>-->
+<!--							&lt;!&ndash; 项目归档撤回&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.archiveStatus === '2'" text type="primary" @click="archiveReback(scope.row)">项目归档撤回</el-button>-->
+<!--							&lt;!&ndash; 项目归档  审核&ndash;&gt;-->
+<!--							<el-button v-if="scope.row.archiveStatus==='2' && checkIsAuditArchive(scope.row)" text type="primary"  @click="examineArchive(scope.row)">归档审核</el-button>-->
+<!--							&lt;!&ndash; 项目归档  被驳回后当前申请人重新调整&ndash;&gt;-->
+<!--							<el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.archiveStatus === '4'" text type="primary"  @click="adjustArchive(scope.row)">驳回调整</el-button>-->
+
+							<!--一级校审ftl文件下载-->
+							<!--              <el-button v-if="hasPermission('program:registered:edit')" text type="primary"  icon="el-icon-circle-check"  @click="downloadFirstAuditTpl(scope.row)">一级校审下载</el-button>-->
+							<!--              <el-button v-if="hasPermission('program:registered:edit')" text type="primary"  icon="el-icon-circle-check"  @click="downloadSecondAuditTpl(scope.row)">二级校审下载</el-button>-->
+							<!--              <el-button v-if="hasPermission('program:registered:edit')" text type="primary"  icon="el-icon-circle-check"  @click="downloadThirdlyAuditTpl(scope.row)">三级校审下载</el-button>-->
+
+							<!--自校功能ftl文件下载-->
+							<!--              <el-button v-if="hasPermission('program:registered:edit')" text type="primary"  icon="el-icon-circle-check"  @click="downloadProofreadAuditTpl(scope.row)">校对审核</el-button>-->
+							<!--              <el-button v-if="hasPermission('program:registered:edit')" text type="primary"  icon="el-icon-circle-check"  @click="downloadAuditRecordFormAfterBindingTpl(scope.row)">评估报告装订后</el-button>-->
+
+							<!--报告签发单-->
+							<!--              <el-button v-if="hasPermission('program:registered:edit')" text type="primary"  icon="el-icon-circle-check"  @click="downloadReportAusstellungTpl(scope.row)">报告签发单</el-button>-->
+
+						</template>
+					</vxe-column>
+				</vxe-table>
+				<vxe-pager
+					background
+					size="small"
+					:current-page="tablePage.currentPage"
+					:page-size="tablePage.pageSize"
+					:total="tablePage.total"
+					:page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+					:layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+					@page-change="currentChangeHandle">
+				</vxe-pager>
+			</div>
+		</div>
+		<ProjectDia  ref="projectDia" @refreshDataList="refreshList"></ProjectDia>
+		<ProjectFormUpdate ref="projectFormUpdate" @refreshDataList="refreshList"></ProjectFormUpdate>
+		<ProofreadForm  ref="proofreadForm" @refreshDataList="refreshList"></ProofreadForm>
+		<ProofreadBrowseForm  ref="proofreadBrowseForm" @refreshDataList="refreshList"></ProofreadBrowseForm>
+		<ContractAddForm ref="contractAddForm"></ContractAddForm>
+	</div>
+</template>
+
+<script>
+	import taskService from '@/api/flowable/taskService'
+	import ProjectInfoService from "@/api/jy/ProjectInfoService";
+	import userService from '@/api/sys/userService'
+	import processService from '@/api/flowable/processService'
+	import pick from 'lodash.pick'
+	import ProjectDia from './ProjectDia'
+	import ContractAddForm from '../workContractInfo/ContractAddForm'
+export default {
+	data(){
+		return {
+			applyUserName: '',
+			showHideItem: false,
+			showHideIcon: 'el-icon-arrow-down',
+			showHideName: '展示',
+			searchForm: {
+				name: '',
+				no: '',
+				createById: '',
+				primaryLinkman: '',//委托方
+				contractName: '',
+				projectLeader:'',//项目负责人
+				createDates: [],
+				status: '',
+				firstInstance: '',  // 一级校审状态
+				secondInstance: '',	// 二级校审状态
+				thirdInstance: '',	// 三级校审状态
+				reportIssuance: '',	// 报告签发
+				outIssuance:'',//外审
+				reportsSubmit:'',//报批签发
+				reviewStatus:'',//归档状态
+			},
+			dataList: [],
+			tablePage: {
+				total: 0,
+				currentPage: 1,
+				pageSize: 10,
+				orders: []
+			},
+			createName: '',
+			loading: false,
+			isAdmin: false,
+			processDefinitionId:'',
+			procDefKey:'',
+			haveProjectIds:''
+		}
+	},
+	ProjectInfoService:null,
+	created(){
+		this.projectInfoService=new ProjectInfoService()
+	},
+	components:{
+		ProjectDia,
+		ContractAddForm
+	},
+	mounted(){
+		this.$nextTick(() => {
+			// 将表格和工具栏进行关联
+			const $table = this.$refs.typeDictTable;
+			const $toolbar = this.$refs.toolbarRef;
+			$table.connect($toolbar);
+		});
+		this.refreshList();
+	},
+	activated(){
+		this.is()
+		this.refreshList()
+	},
+	computed:{
+		userName () {
+			return this.$store.state.user.name
+		},
+		user () {
+			this.createName = this.$store.state.user.name
+			return this.$store.state.user
+		}
+	},
+	methods:{
+		showHide () {
+			if (this.showHideItem === false) {
+				this.showHideItem = true
+				this.showHideIcon = 'el-icon-arrow-up'
+				this.showHideName = '隐藏'
+			} else {
+				this.showHideItem = false
+				this.showHideIcon = 'el-icon-arrow-down'
+				this.showHideName = '展示'
+			}
+		},
+		// 新增
+		add () {
+			this.$refs.projectForm.init('add', '')
+		},
+		// 修改
+		edit (id) {
+			id = id || this.$refs.typeDictTable.getCheckboxRecords().map(item => {
+				return item.id
+			})[0]
+			this.$refs.projectFormUpdate.init('edit', id)
+		},
+		// 查看
+		view (row) {
+			this.$refs.projectDia.init('view', row.id)
+		},
+		// 获取数据列表
+		refreshList () {
+			this.loading = true
+			this.createName = this.$store.state.user.name
+			this.projectInfoService.list({
+				'current': this.tablePage.currentPage,
+				'size': this.tablePage.pageSize,
+				'orders': this.tablePage.orders,
+				...this.searchForm
+			}).then((data) => {
+				this.dataList = data.records
+				this.tablePage.total = data.total
+				this.loading = false
+			})
+			// 获取当前登录人的所属项目id集合
+			this.projectInfoService.getHaveProjectIds().then((data) => {
+				if (this.commonJS.isNotEmpty(data)) {
+					this.haveProjectIds = data.map(i => {
+						if (this.commonJS.isNotEmpty(i)) {
+							return i
+						}
+					}).join(',')
+				}
+			})
+			processService.getByName('嘉溢-项目登记').then((data) => {
+				if (!this.commonJS.isEmpty(data.id)) {
+					this.processDefinitionId = data.id
+					this.procDefKey = data.key
+				}
+			})
+		},
+		// 当前页
+		currentChangeHandle ({ currentPage, pageSize }) {
+			this.tablePage.currentPage = currentPage
+			this.tablePage.pageSize = pageSize
+			this.refreshList()
+		},
+		// 排序
+		sortChangeHandle (column) {
+			this.tablePage.orders = []
+			if (column.order != null) {
+				this.tablePage.orders.push({column: this.$utils.toLine(column.property), asc: column.order === 'asc'})
+			}
+			this.refreshList()
+		},
+		// 删除
+		deleteAll (id) {
+			let ids = id || this.$refs.typeDictTable.getCheckboxRecords().map(item => {
+				return item.id
+			}).join(',')
+			this.$confirm(`确定删除所选项吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.loading = true
+				this.projectInfoService.deleteAll(ids).then((data) => {
+					this.$message.success(data)
+					this.refreshList()
+					this.loading = false
+				})
+			})
+		},
+		// 删除
+		del (id) {
+			let ids = id || this.$refs.typeDictTable.getCheckboxRecords().map(item => {
+				return item.id
+			}).join(',')
+			this.$confirm(`确定删除所选项吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.loading = true
+				this.projectInfoService.delete(ids).then((data) => {
+					this.$message.success(data)
+					this.refreshList()
+					this.loading = false
+				})
+			})
+		},
+		resetSearch () {
+			this.searchForm.createById = ''
+			this.applyUserName = ''
+			this.$refs.searchForm.resetFields()
+			this.refreshList()
+		},
+		// 查询当前登录人是否是数据的审核人
+		checkIsAudit (row) {
+			let loginUserId = this.$store.state.user.id  // 获取当前登录用户id
+			if (this.commonJS.isNotEmpty(row.auditUserIds)) {
+				for (const userId of row.auditUserIds) {
+					if (userId === loginUserId) {  // 当数据的审核人中包含当前登录人id时，返回true
+						return true
+					}
+				}
+			}
+			return false
+		},
+		is () {
+			userService.is().then((data) => {
+				this.isAdmin = data
+			})
+			console.log('is',this.isAdmin)
+		},
+		// 发起项目登记审批
+		// registeredPush (row) {
+		// 	// 读取流程表单
+		// 	let title = `发起流程【项目登记审批】`
+		// 	let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目登记审批]`
+		// 	let status = 'startAndHold'
+		// 	if (row.status === '3') {
+		// 		status = 'startAndClose'
+		// 	} else if (row.status === '4') {
+		// 		status = 'reapplyFlag'
+		// 	}
+		// 	taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
+		// 		businessId: row.id,
+		// 		businessTable: 'program_project_list_info'}).then((data) => {
+		// 		this.$router.push({
+		// 			path: '/flowable/task/TaskForm',
+		// 			query: {
+		// 				...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+		// 				procDefId: this.processDefinitionAuditId,
+		// 				procDefKey: this.procDefAuditKey,
+		// 				title: title,
+		// 				formType: data.formType,
+		// 				formUrl: data.formUrl,
+		// 				formTitle: processTitle,
+		// 				businessTable: 'program_project_list_info',
+		// 				businessId: row.id,
+		// 				isShow: 'false',
+		// 				status: status,
+		// 				routePath: '/program/registered/ProjectList'
+		// 			}
+		// 		})
+		// 	})
+		// },
+		// // 查看项目登记审批流程结果
+		registeredDetail (row) {
+			if (row.status !== '0' && row.status !== '1') {
+				this.projectInfoService.findById(row.id).then((data)=>{
+					console.log('data',data)
+					// eslint-disable-next-line eqeqeq
+					taskService.getTaskDef({
+						procInsId: data.procInsId,
+						procDefId: data.processDefinitionId
+					}).then((data) => {
+						this.$router.push({
+							path: '/flowable/task/TaskFormDetail',
+							query: {
+								...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+								isShow: 'false',
+								readOnly: true,
+								title: '项目登记' + '流程详情',
+								formTitle: '项目登记' + '流程详情',
+								businessId: row.id,
+								status: 'reback',
+								method: 'view'
+							}
+						})
+					})
+				})
+
+			}
+		},
+		// // 撤回项目登记审批
+		registeredReback (row) {
+			this.$confirm(`确定要撤回该申请吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(async () => {
+				await this.projectInfoService.findById(row.id).then((data) => {
+					if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+						this.$message.error('数据已发生改变或不存在，请刷新数据')
+						this.refreshList()
+					} else {
+						processService.revokeProcIns(row.procInsId).then((data) => {
+							let form = {status: '3', id: row.id}
+							this.projectInfoService.updateStatusById(form)
+							this.$message.success(data)
+							this.refreshList()
+						})
+					}
+				})
+			})
+		},
+		start () {
+			// 读取流程表单
+			let tabTitle = `发起流程【嘉溢-项目登记】`
+			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-项目登记]`
+			taskService.getTaskDef({ procDefId: this.processDefinitionId,
+				status: 'startAndHold'}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionId,
+						procDefKey: this.procDefKey,
+						status: 'startAndHold',
+						title: tabTitle,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessId: 'false',
+						isShow: false,
+						routePath: '/jy/project/ProjectList'
+					}
+				})
+			})
+		},
+		// 审核
+		examine (row) {
+			this.projectInfoService.findById(row.id).then((data) => {
+				if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+					this.$message.error('数据已发生改变或不存在，请刷新数据')
+					this.refreshList()
+				} else {
+					this.todo(row)
+				}
+			})
+		},
+		// 驳回后调整
+		adjust (row) {
+			this.projectInfoService.findById(row.id).then((data) => {
+				if (data.status !== '4') { // status的值不等于“驳回”，就弹出提示
+					this.$message.error('数据已发生改变或不存在，请刷新数据')
+					this.refreshList()
+				} else {
+					this.todo(row)
+				}
+			})
+		},
+		// 审核或重新调整跳转
+		todo (row) {
+			let cUser = false
+			taskService.getTaskDefInfo({
+				taskId: row.taskId
+			}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'),
+						isShow: false,
+						formReadOnly: true,
+						formTitle: `${data.taskName}`,
+						cUser: cUser,
+						title: `审批【${data.taskName || ''}】`,
+						routePath: '/jy/project/ProjectList'   // 数据处理后需要跳转的页面路径
+					}
+				})
+			})
+		},
+		viewContract (id) {
+			this.$refs.contractAddForm.init('view', id)
+		},
+	}
+}
+</script>

src/views/jy/workClientInfo/WorkClientChooseRadio.vue

@@ -65,14 +65,14 @@
           :radio-config="{trigger: 'row'}">
           <vxe-column type="seq" width="40"></vxe-column>
           <vxe-column type="radio" width="60px"></vxe-column>
-          <vxe-column width="230px" title="客户名称" align="center" field="name" tree-node show-overflow="title"></vxe-column>
-          <vxe-column width="200px" title="客户编号" align="center" field="number"></vxe-column>
-          <vxe-column width="200px" title="客户类型" align="center" field="clientType">
+          <vxe-column width="300px" title="客户名称" align="center" field="name" tree-node show-overflow="title"></vxe-column>
+          <vxe-column width="300px" title="客户编号" align="center" field="number"></vxe-column>
+          <vxe-column width="300px" title="客户类型" align="center" field="clientType">
             <template #default="scope">
               {{$dictUtils.getDictLabel('customer_type', scope.row.clientType, '-')}}
             </template>
           </vxe-column>
-          <vxe-column width="230px" title="所属行业" align="center" field="companyIndustry">
+          <vxe-column width="300px" title="所属行业" align="center" field="companyIndustry">
             <template #default="scope">
               {{$dictUtils.getDictLabel('industry', scope.row.companyIndustry, '-')}}
             </template>

src/views/jy/workContractInfo/ContractAddForm.vue

@@ -282,6 +282,7 @@
   import WorkClientForm from '../workClientInfo/WorkClientForm'
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import WorkClientChooseRadio from '../workClientInfo/WorkClientChooseRadio'
+  import WorkClientService from '@/api/jy/WorkClientService'
   import dictService from "@/api/sys/dictService";
   import OSSSerive, {
     httpRequest,
@@ -373,6 +374,7 @@
 			contractDate:'',
 			effectiveDate: '',
 			closingDate: '',
+			contractTypeFirst:''
         },
         activeName1: 'contractProper',
 		  activeName:'contactParty',
@@ -392,6 +394,7 @@
         keyWatch: ''
       }
     },
+	  workClientService: null,
     props: {
       businessId: {
         type: String,
@@ -422,6 +425,7 @@
     created () {
       this.ossService = new OSSSerive()
 		this.contractService=new WorkContractService()
+		this.workClientService = new WorkClientService()
     },
     mounted () {
       window.onPreview = this.onPreview
@@ -517,6 +521,7 @@
           contractOpposite: '',
 			contractTypes:[],
 			primaryLinkman:'',
+			contractTypeFirst:''
         }
         this.inputForm.id = id
 
@@ -547,6 +552,9 @@
 					if(data.contractType){
 						this.showType(data.contractType)
 					}
+					this.contractService.findByPrimaryName(data.primaryLinkman).then((data)=>{
+
+					})
 					this.inputForm.department=data.department
 					console.log('data',data.contractTypes)
 					if (this.commonJS.isEmpty(this.inputForm.department)) {

src/views/jy/workContractInfo/JyWorkContractList.vue

@@ -35,10 +35,10 @@
 				</el-date-picker>
 			</el-form-item>
 
-			<el-form-item v-if="showHideItem" label="归档状态" prop="filedType">
+			<el-form-item v-if="showHideItem" label="状态" prop="filedType">
 				<el-select v-model="searchForm.filedType" placeholder="请选择" style="width:100%;">
 					<el-option
-						v-for="item in $dictUtils.getDictList('filed_type')"
+						v-for="item in $dictUtils.getDictList('approval_type')"
 						:key="item.value"
 						:label="item.label"
 						:value="item.value">
@@ -46,8 +46,13 @@
 				</el-select>
 			</el-form-item>
 
-			<el-form-item v-if="showHideItem" label="合同金额" prop="contractAmount">
-				<el-input  v-model="searchForm.contractAmount" placeholder="请输入合同金额" clearable></el-input>
+			<el-form-item v-if="showHideItem" label="合同金额" prop="contractAmounts">
+				<InputNumber :disabled="false" :precision="num"
+							 :value="searchForm.contractAmounts"
+							 @changefrom="(val) => {searchForm.contractAmounts[0] = val}"
+							 @changeto="(val) => {searchForm.contractAmounts[1] = val}"
+				>
+				</InputNumber>
 			</el-form-item>
 
 			<el-form-item v-if="showHideItem" label="创建人" prop="createById">
@@ -113,9 +118,9 @@
 					<vxe-column min-width="100px" title="合同金额(元)" field="contractAmount" align="center"></vxe-column>
 					<vxe-column min-width="100px" title="创建人" field="createById" align="center"></vxe-column>
 					<vxe-column min-width="150px" title="创建时间" field="createTime" align="center"></vxe-column>
-					<vxe-column min-width="100px"  title="归档状态" field="filedType" fixed="right" align="center">
+					<vxe-column min-width="100px"  title="状态" field="filedType" fixed="right" align="center">
 						<template #default="scope">
-							<el-button  @click="detailFiled(scope.row)" :type="$dictUtils.getDictLabel('filed_type_status', scope.row.filedType, '')" effect="dark">{{$dictUtils.getDictLabel("filed_type", scope.row.filedType, '未归档')}} </el-button>
+							<el-button  @click="detailFiled(scope.row)" :type="$dictUtils.getDictLabel('approval_type_status', scope.row.filedType, '')" effect="dark">{{$dictUtils.getDictLabel("approval_type", scope.row.filedType, '未登记')}} </el-button>
 						</template>
 					</vxe-column>
 					<!--                <vxe-column width="100px"  title="借用状态" field="borrowType" >-->
@@ -126,13 +131,12 @@
 
 					<vxe-column title="操作" width="200px" fixed="right" align="center">
 						<template  #default="scope">
-							<el-button v-if="hasPermission('jy_work_contract:info:field') && scope.row.createId === $store.state.user.id && (scope.row.filedType === '0' || scope.row.filedType === undefined)" text type="primary"  @click="filed(scope.row.id)">归档</el-button>
 							<!--归档暂存修改-->
-							<el-button v-if="hasPermission('jy_work_contract:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.filedType === '0' || scope.row.filedType === undefined)" text type="primary"  @click="updateFiled(scope.row.id)">修改</el-button>
+							<el-button v-if="hasPermission('jy_work_contract:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.filedType === '0' || scope.row.filedType === '1')" text type="primary"  @click="updateFiled(scope.row.id)">修改</el-button>
 							<!--归档撤回-->
 							<el-button v-if="hasPermission('jy_work_contract:info:back') && scope.row.filedType === '2'  && scope.row.createId === $store.state.user.id" text type="primary"   @click="rebackFiled(scope.row)">撤回</el-button>
 							<!--              合同归档  审核-->
-							<el-button v-if="scope.row.filedType==='2' && checkIsAuditFiled(scope.row)" text type="primary"   @click="examineFiled(scope.row)">归档审核</el-button>
+							<el-button v-if="scope.row.filedType==='2' && checkIsAuditFiled(scope.row)" text type="primary"   @click="examineFiled(scope.row)">审核</el-button>
 							<!--              合同归档  被驳回后当前申请人重新调整-->
 							<el-button v-if="hasPermission('jy_work_contract:info:edit')&&scope.row.createId === $store.state.user.id&&scope.row.filedType === '4'" text type="primary"   @click="adjustFiled(scope.row)">驳回调整</el-button>
 							</template>
@@ -184,7 +188,7 @@
 					name: '',
 					contractDates: [],
 					filedType: '',
-					contractAmount: '',
+					contractAmounts: [],
 					createById: '',
 					procInsId: '',
 					processDefinitionId: '',
@@ -268,7 +272,7 @@
 					this.tablePage.total = data.total
 					this.loading = false
 				})
-				processService.getByName('评估-合同登记').then((data) => {
+				processService.getByName('嘉溢-合同归档').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
 						this.procDefKey = data.key
@@ -297,7 +301,29 @@
 			},
 			// 新增
 			add () {
-				this.$refs.contractAddForm.init('add', '')
+				// 读取流程表单
+				let tabTitle = `发起流程【嘉溢-合同归档】`
+				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-合同归档]`
+				taskService.getTaskDef({ procDefId: this.processDefinitionId,
+					status: 'startAndHold'}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							procDefId: this.processDefinitionId,
+							procDefKey: this.procDefKey,
+							status: 'startAndHold',
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessId: 'false',
+							isShow: false,
+							formReadOnly: false,
+							routePath: '/jy/workContractInfo/JyWorkContractList'
+						}
+					})
+				})
 			},
 			// 管理员修改
 			editForm (id) {
@@ -420,62 +446,62 @@
 				})
 			},
 			// 归档
-			filed (id) {
-				processService.getByName('嘉溢-合同归档').then((data) => {
-					if (!this.commonJS.isEmpty(data.id)) {
-						// 读取流程表单
-						let tabTitle = `发起流程【嘉溢-合同归档】`
-						let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-合同归档]`
-						taskService.getTaskDef({ procDefId: data.id,
-							businessId: id,
-							businessTable: 'jy_work_contract_info',
-							status: 'audit',
-							method:'views'}).then((reture) => {
-							this.$router.push({
-								path: '/flowable/task/TaskForm',
-								query: {
-									...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
-									procDefId: data.id,
-									procDefKey: data.key,
-									status: 'startAndHoldFiled',
-									title: tabTitle,
-									formType: reture.formType,
-									formUrl: reture.formUrl,
-									formTitle: processTitle,
-									businessTable: 'jy_work_contract_info',
-									businessId: id,
-									isShow: false,
-									routePath: '/jy/workContractInfo/JyWorkContractList'
-								}
-							})
-						})
-						// 读取流程表单
-						// let tabTitle = `发起流程【合同登记归档】`
-						// let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
-						// this.taskService.getTaskDef({ procDefId: data.id,
-						//   businessId: id,
-						//   businessTable: 'work_contract_file',
-						//   status: 'startAndHoldFiled'}).then((reture) => {
-						//     this.$router.push({
-						//       path: '/flowable/task/TaskForm',
-						//       query: {
-						//         procDefId: data.id,
-						//         procDefKey: data.key,
-						//         status: 'startAndHoldFiled',
-						//         title: tabTitle,
-						//         formType: reture.data.formType,
-						//         formUrl: reture.data.formUrl,
-						//         formTitle: processTitle,
-						//         businessTable: 'work_contract_file',
-						//         businessId: id,
-						//         isShow: false,
-						//         routePath: '/workContract/WorkContractList'
-						//       }
-						//     })
-						//   })
-					}
-				})
-			},
+			// filed (id) {
+			// 	processService.getByName('嘉溢-合同归档').then((data) => {
+			// 		if (!this.commonJS.isEmpty(data.id)) {
+			// 			// 读取流程表单
+			// 			let tabTitle = `发起流程【嘉溢-合同归档】`
+			// 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-合同归档]`
+			// 			taskService.getTaskDef({ procDefId: data.id,
+			// 				businessId: id,
+			// 				businessTable: 'jy_work_contract_info',
+			// 				status: 'audit',
+			// 				method:'views'}).then((reture) => {
+			// 				this.$router.push({
+			// 					path: '/flowable/task/TaskForm',
+			// 					query: {
+			// 						...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+			// 						procDefId: data.id,
+			// 						procDefKey: data.key,
+			// 						status: 'startAndHoldFiled',
+			// 						title: tabTitle,
+			// 						formType: reture.formType,
+			// 						formUrl: reture.formUrl,
+			// 						formTitle: processTitle,
+			// 						businessTable: 'jy_work_contract_info',
+			// 						businessId: id,
+			// 						isShow: false,
+			// 						routePath: '/jy/workContractInfo/JyWorkContractList'
+			// 					}
+			// 				})
+			// 			})
+			// 			// 读取流程表单
+			// 			// let tabTitle = `发起流程【合同登记归档】`
+			// 			// let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
+			// 			// this.taskService.getTaskDef({ procDefId: data.id,
+			// 			//   businessId: id,
+			// 			//   businessTable: 'work_contract_file',
+			// 			//   status: 'startAndHoldFiled'}).then((reture) => {
+			// 			//     this.$router.push({
+			// 			//       path: '/flowable/task/TaskForm',
+			// 			//       query: {
+			// 			//         procDefId: data.id,
+			// 			//         procDefKey: data.key,
+			// 			//         status: 'startAndHoldFiled',
+			// 			//         title: tabTitle,
+			// 			//         formType: reture.data.formType,
+			// 			//         formUrl: reture.data.formUrl,
+			// 			//         formTitle: processTitle,
+			// 			//         businessTable: 'work_contract_file',
+			// 			//         businessId: id,
+			// 			//         isShow: false,
+			// 			//         routePath: '/workContract/WorkContractList'
+			// 			//       }
+			// 			//     })
+			// 			//   })
+			// 		}
+			// 	})
+			// },
 			//修改
 			updateFiled(id){
 				this.$refs.contractAddForm.init('edit', id)

src/views/jy/workContractInfo/WorkContractForm.vue

@@ -67,19 +67,7 @@
 				  <el-form-item label="合同类型" prop="contractTypes"
 								:rules="[{required: true, message: '合同类型不能为空', trigger: 'blur'}
                  ]" >
-					  <div style="width: 100%;" v-if="status==='edit'">
-						  <el-cascader v-model="inputForm.contractTypes" :options="typeData" @change="handleChange" :props="{
-				checkStrictly: true,
-				value: 'value',
-				label: 'label', // 显示名称
-				children: 'children', // 子级字段名
-			}" />
-					  </div>
-					  <div v-else>
-						  <el-input maxlength="64" :readonly="true" v-model="inputForm.contractTypes" placeholder="请输入合同类型"></el-input>
-					  </div>
-
-
+					  <el-input maxlength="64" :readonly="true" v-model="inputForm.contractTypes" placeholder="请输入合同类型"></el-input>
 				  </el-form-item>
 			  </el-col>
 
@@ -350,6 +338,7 @@
 				  customerName: '',
 			  },
 			  inputForm: {
+			  	id:'',
 				  customerId: '',  // 客户id
 				  address: '',
 				  uscCode: '',
@@ -548,6 +537,7 @@
 			  this.loading = false
 			  this.$nextTick(() => {
 				  this.$refs.inputForm.resetFields()
+				  if (method === 'edit' || method === 'view') {
 					  this.loading = true
 					  this.$refs.uploadComponent.clearUpload()
 					  // this.$refs.archiveFile.clearUpload()
@@ -556,9 +546,9 @@
 							  this.inputForm = this.recover(this.inputForm, data)
 							  // this.inputForm.cwWorkClientContactDTOList=data.cwWorkClientContactDTOList
 							  console.log('data', data)
-								this.inputForm.contractNo=data.no
-								this.inputForm.contractTypes=data.contractType
-								this.inputForm.contractDate=data.contractDate
+							  this.inputForm.contractNo = data.no
+							  this.inputForm.contractTypes = data.contractTypes[0][1]
+							  this.inputForm.contractDate = data.contractDate
 							  if (this.formReadOnly) {
 								  method = 'view'
 							  }
@@ -567,6 +557,7 @@
 							  this.loading = false
 						  })
 					  }
+				  }
 			  })
 		  },
 		  // 查看