Przeglądaj źródła

评估模块代码提交

wangqiang 1 rok temu
rodzic
commit
a93640a862

+ 3 - 1
src/views/common/UpLoadComponent.vue

@@ -313,7 +313,9 @@
 	  	// this.$refs.upload.handleRemove(this.dataListNew[index])
         await this.dataListNew.splice(index, 1)
 		await this.dataList.splice(index, 1)
-		this.ossService.deleteMsgById(row.id)
+		  if (this.commonJS.isNotEmpty(row.id)) {
+			  this.ossService.deleteMsgById(row.id)
+		  }
 		this.tableKey = Math.random()
       },
       /**

+ 2 - 2
src/views/program/registered/ContractForm.vue

@@ -70,8 +70,8 @@
               {{ $dictUtils.getDictLabel("contract_type", scope.row.contractType, '-') }}
             </template>
           </vxe-column>
-          <vxe-column min-width="150px" title="创建时间" field="createDate"></vxe-column>
-          <vxe-column min-width="100px" title="创建人" field="createBy"></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

+ 33 - 19
src/views/program/registered/ProjectThreeAuditFormDialog.vue

@@ -76,47 +76,61 @@
               <el-form-item label="明细表" prop="detailOpinion"
               >
                 <!--            <el-input type="textarea" style="width:100%" maxlength="1000" v-model="inputForm.detailOpinion" placeholder="请填写明细表"     ></el-input>-->
-                <WangEditor ref="contents1Editor" v-model="inputForm.detailOpinion"/>
+                <WangEditor style="width:100%" ref="contents1Editor" v-model="inputForm.detailOpinion"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="评估报告" prop="reportOpinion"
               >
                 <!--            <el-input type="textarea" style="width:100%" maxlength="1000" v-model="inputForm.reportOpinion" placeholder="请填写评估报告"     ></el-input>-->
-                <WangEditor ref="contents2Editor" v-model="inputForm.reportOpinion"/>
+                <WangEditor style="width:100%" ref="contents2Editor" v-model="inputForm.reportOpinion"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="技术说明" prop="remarksOpinion"
               >
                 <!--            <el-input type="textarea" style="width:100%" maxlength="1000" v-model="inputForm.remarksOpinion" placeholder="请填写技术说明"     ></el-input>-->
-                <WangEditor ref="contents3Editor" v-model="inputForm.remarksOpinion"/>
+                <WangEditor style="width:100%" ref="contents3Editor" v-model="inputForm.remarksOpinion"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="工作底稿" prop="workOpinion"
               >
                 <!--            <el-input type="textarea" style="width:100%" maxlength="1000" v-model="inputForm.workOpinion" placeholder="请填写工作底稿"     ></el-input>-->
-                <WangEditor ref="contents4Editor" v-model="inputForm.workOpinion"/>
+                <WangEditor style="width:100%" ref="contents4Editor" v-model="inputForm.workOpinion"/>
               </el-form-item>
             </el-col>
-            <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
-                     label-width="125px" @submit.native.prevent>
-              <el-col :span="24">
-                <el-form-item label="执行人员保留意见" prop="retainOpinion"
-                              :rules="[
+<!--            <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"-->
+<!--                     label-width="125px" @submit.native.prevent>-->
+<!--              <el-col :span="24">-->
+<!--                <el-form-item label="执行人员保留意见" prop="retainOpinion" -->
+<!--                              :rules="[-->
+<!--                 ]">-->
+<!--                  <el-input type="textarea" :rows="5" maxlength="500" v-model="inputForm.retainOpinion" placeholder="请填写执行人员保留意见"     ></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--              <el-col :span="24">-->
+<!--                <el-form-item label="审核人员审核未修改意见" prop="changeOpinion"-->
+<!--                              :rules="[-->
+<!--                 ]">-->
+<!--                  <el-input type="textarea" :rows="5"  maxlength="500" v-model="inputForm.changeOpinion" placeholder="请填写审核人员审核未修改意见"     ></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--            </el-form>-->
+			  <el-col :span="24">
+				  <el-form-item label="执行人员保留意见" prop="retainOpinion"
+								:rules="[
                  ]">
-                  <el-input type="textarea" :rows="5" maxlength="500" v-model="inputForm.retainOpinion" placeholder="请填写执行人员保留意见"     ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="审核人员审核未修改意见" prop="changeOpinion"
-                              :rules="[
+					  <el-input :disabled="method==='view'?'readonly':''" type="textarea" :rows="5" maxlength="500" v-model="inputForm.retainOpinion" placeholder="请填写执行人员保留意见"     ></el-input>
+				  </el-form-item>
+			  </el-col>
+			  <el-col :span="24">
+				  <el-form-item label="审核人员审核未修改意见" prop="changeOpinion"
+								:rules="[
                  ]">
-                  <el-input type="textarea" :rows="5"  maxlength="500" v-model="inputForm.changeOpinion" placeholder="请填写审核人员审核未修改意见"     ></el-input>
-                </el-form-item>
-              </el-col>
-            </el-form>
+					  <el-input :disabled="method==='view'?'readonly':''" type="textarea" :rows="5"  maxlength="500" v-model="inputForm.changeOpinion" placeholder="请填写审核人员审核未修改意见"     ></el-input>
+				  </el-form-item>
+			  </el-col>
           </el-row>
 
 

+ 29 - 21
src/views/program/registered/RegisItemForm.vue

@@ -635,12 +635,15 @@
 					: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>-->
+<!--									<vxe-button :disabled="status === 'audit' || status === 'taskFormDetail'" @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></vxe-button>-->
+<!--								</template>-->
+<!--							</vxe-input>-->
+<!--						</template>-->
 						<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>
-									<vxe-button :disabled="status === 'audit' || status === 'taskFormDetail'" @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></vxe-button>
-								</template>
-							</vxe-input>
+							<el-input v-model="scope.row.name" ></el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="workHours" title="预计工时(时)" :edit-render="{name: '$input'}"  align="center">
@@ -1199,7 +1202,9 @@
               }
             }
           })
+			console.log('this.inputForm.members', this.inputForm.members)
           this.inputForm.members.forEach((item, index) => {
+          	console.log('item', item)
             if (this.commonJS.isEmpty(item.name)) {
               this.loading = false
               this.$message.error('项目组成员姓名不允许为空')
@@ -1474,23 +1479,26 @@
       insertEvent (type) {
         if (type === 'member') {
           if (this.commonJS.isEmpty(this.inputForm.members)) {
-            this.inputForm.members = []
+			this.$refs.memberTable.insertAt({})
+            this.inputForm.members.push({})
+            // this.inputForm.members = []
           }
-          this.$refs.memberTable.insert().then((data) => {
-            data.name = ''
-            data.workHours = ''
-            data.type = ''
-            data.job = ''
-            // if (this.commonJS.isEmpty(this.inputForm.members)) {
-            //   this.inputForm.members = []
-            //   this.inputForm.members.push(data)
-            // } else {
-            //   this.inputForm.members.push(data)
-            // }
-            this.inputForm.members.push(data)
-            console.log(this.inputForm.members)
-            console.log(this.inputForm.members)
-          })
+          // this.$refs.memberTable.insert().then((data) => {
+          //   data.name = ''
+          //   data.workHours = ''
+          //   data.type = ''
+          //   data.job = ''
+          //   // if (this.commonJS.isEmpty(this.inputForm.members)) {
+          //   //   this.inputForm.members = []
+          //   //   this.inputForm.members.push(data)
+          //   // } else {
+          //   //   this.inputForm.members.push(data)
+          //   // }
+          //   this.inputForm.members.push(data)
+          //   console.log(this.inputForm.members)
+          //   console.log(this.inputForm.members)
+          // })
+			this.memberKey = Math.random()
         }
         if (type === 'contact') {
           this.$refs.contactTable.insert().then((data) => {

+ 2 - 2
src/views/program/registered/WorkClientForm.vue

@@ -110,8 +110,8 @@
             </template>
           </vxe-column>
           <vxe-column min-width="200px" title="统一社会信用代码" field="uscCode" > </vxe-column>
-          <vxe-column min-width="100px" title="创建人" field="createBy" > </vxe-column>
-          <vxe-column min-width="150px" title="创建时间" field="createDate" > </vxe-column>
+          <vxe-column min-width="100px" title="创建人" field="createById" > </vxe-column>
+          <vxe-column min-width="150px" title="创建时间" field="createTime" > </vxe-column>
         </vxe-table>
 
         <vxe-pager

+ 1 - 1
src/views/workContract/WorkContractFileForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
+    <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
              label-width="150px">
       <el-row  :gutter="0">
         <el-col :span="12">

+ 6 - 2
src/views/workContract/WorkContractForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
+    <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
              label-width="150px">
       <el-row  :gutter="0">
         <el-col :span="12">
@@ -252,7 +252,11 @@
       formReadOnly: {
         type: Boolean,
         default: false
-      }
+      },
+		status: {
+			type: String,
+			default: ''
+		}
     },
     components: {
       // ElImageViewer,