소스 검색

Merge remote-tracking branch 'origin/master'

lizhenhao 2 년 전
부모
커밋
603c8f64d7

+ 1 - 1
src/views/modules/materialManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -77,7 +77,7 @@
           <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="入库人" field="wareHouseManName"></vxe-column>
           <vxe-column min-width="160" align="center" title="入库部门" field="wareHouseManOfficeName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="入库类型" field="wareHouseType"></vxe-column>
+          <vxe-column min-width="160" align="center" title="入库类型" field="wareHouseTypeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="商品名称" field="tradeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="商品数量" field="tradeNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="单位" field="company"></vxe-column>

+ 32 - 13
src/views/modules/program/registered/ProjectArchiveForm.vue

@@ -145,7 +145,6 @@
             <el-col :span="12">
               <el-form-item label="废旧物资评估(万元)" prop="waystEvaluation"
                             :rules="[
-                        {required: true, message:'废旧物资评估不能为空', trigger:'blur'}
                  ]">
                 <el-input-number
                   v-model="inputForm.waystEvaluation"
@@ -164,7 +163,6 @@
             <el-col :span="12">
               <el-form-item label="固定资产评估(万元)" prop="fixedAssetsEvaluation"
                             :rules="[
-                        {required: true, message:'固定资产评估不能为空', trigger:'blur'}
                  ]">
                 <el-input-number
                   v-model="inputForm.fixedAssetsEvaluation"
@@ -183,7 +181,6 @@
             <el-col :span="12">
               <el-form-item label="净资产评估" prop="netAssetsEvaluation"
                             :rules="[
-                        {required: true, message:'净资产评估不能为空', trigger:'blur'}
                  ]">
                 <el-input-number
                   v-model="inputForm.netAssetsEvaluation"
@@ -201,7 +198,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="租金评估(万/年)" prop="rentEvaluation"
+              <el-form-item label="租金评估(万)" prop="rentEvaluation"
                             :rules="[
                         {required: true, message:'租金评估不能为空', trigger:'blur'}
                  ]">
@@ -261,15 +258,15 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="当前处理人" prop="currentDisposePerson"
+              <el-form-item label="租金类型" prop="rentType"
                             :rules=" [
-                        {required: true, message:'当前处理人不能为空', trigger:'blur'}
+                        {required: true, message:'租金类型不能为空', trigger:'blur'}
                         ]" >
-                <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.currentDisposePerson" @getValue='(value) => {inputForm.currentDisposePerson = value}'></UserSelect>
+                <el-input v-model="inputForm.rentType" maxlength="64" placeholder="请填写租金类型"   clearable  ></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="是否开票" prop="isInvoice"
                             :rules="[
                         {required: true, message:'是否开票不能为空', trigger:'blur'}
@@ -279,6 +276,10 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="24" style="margin-bottom: 30px">
+              <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>
+            </el-col>
+
             <el-col :span="12">
               <el-form-item label="开票日期" prop="invoiceDate"
                             :rules="[
@@ -414,6 +415,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="当前处理人" prop="currentDisposePerson"
+                            :rules=" [
+                        {required: true, message:'当前处理人不能为空', trigger:'blur'}
+                        ]" >
+                <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.currentDisposePerson" @getValue='(value) => {inputForm.currentDisposePerson = value}'></UserSelect>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <!--              原司法鉴定-->
               <el-form-item label="其他" prop="forensics"
                             :rules="[
@@ -466,7 +475,7 @@
           <!--附件信息 - 评估说明-->
           <UpLoadComponent ref="uploadComponentExplain"></UpLoadComponent>
           <!--附件信息 - 评估明细表-->
-          <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>
+<!--          <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>-->
           <!--附件信息 - 评估操作计算底稿-->
           <UpLoadComponent ref="uploadComponentPapers"></UpLoadComponent>
           <!--附件信息 - 其他-->
@@ -518,6 +527,7 @@
           rentEvaluation: '',
           forensics: '',
           reportCharges: '',
+          rentType: '',
           currentDisposePerson: '',
           isInvoice: '',
           invoiceDate: '',
@@ -558,9 +568,9 @@
     computed: {
       bus: {
         get () {
-          this.$refs.uploadComponentReport.setDividerName('评估报告')
+          this.$refs.uploadComponentReport.setDividerName('评估报告及评估明细表')
           this.$refs.uploadComponentExplain.setDividerName('评估说明')
-          this.$refs.uploadComponentDetail.setDividerName('评估明细表')
+          this.$refs.uploadComponentDetail.setDividerName('图片上传')
           this.$refs.uploadComponentPapers.setDividerName('评估操作计算底稿')
           this.$refs.uploadComponentOther.setDividerName('其他')
           return this.businessId
@@ -616,6 +626,7 @@
           rentEvaluation: '',
           forensics: '',
           reportCharges: '',
+          rentType: '',
           currentDisposePerson: '',
           isInvoice: '',
           invoiceDate: '',
@@ -659,6 +670,7 @@
             rentEvaluation: '',
             forensics: '',
             reportCharges: '',
+            rentType: '',
             currentDisposePerson: '',
             isInvoice: '',
             invoiceDate: '',
@@ -728,9 +740,9 @@
             if (this.commonJS.isEmpty(this.inputForm.otherFileList)) {
               this.inputForm.otherFileList = []
             }
-            this.$refs.uploadComponentReport.newUpload(method, this.inputForm.reportFileList, 'program', null, '评估报告')
+            this.$refs.uploadComponentReport.newUpload(method, this.inputForm.reportFileList, 'program', null, '评估报告及评估明细表')
             this.$refs.uploadComponentExplain.newUpload(method, this.inputForm.explainFileList, 'program', null, '评估说明')
-            this.$refs.uploadComponentDetail.newUpload(method, this.inputForm.detailFileList, 'program', null, '评估明细表')
+            this.$refs.uploadComponentDetail.newUpload(method, this.inputForm.detailFileList, 'program', null, '图片上传')
             this.$refs.uploadComponentPapers.newUpload(method, this.inputForm.papersFileList, 'program', null, '评估操作计算底稿')
             this.$refs.uploadComponentOther.newUpload(method, this.inputForm.otherFileList, 'program', null, '其他')
             this.loading = false
@@ -813,6 +825,12 @@
         this.$refs['inputForm'].validate((valid) => {
           console.log('')
           if (valid) {
+            if (this.commonJS.isEmpty(this.inputForm.waystEvaluation) &&
+              this.commonJS.isEmpty(this.inputForm.fixedAssetsEvaluation) &&
+              this.commonJS.isEmpty(this.inputForm.netAssetsEvaluation)) {
+              this.$message.error('废旧物资评估值(万元)、固定资产评估值(万元)、净资产评估值,至少要填写一个!')
+              throw new Error()
+            }
             this.loading = true
             this.inputForm.reportFileList = this.$refs.uploadComponentReport.getDataList()
             this.inputForm.explainFileList = this.$refs.uploadComponentExplain.getDataList()
@@ -951,6 +969,7 @@
           rentEvaluation: '',
           forensics: '',
           reportCharges: '',
+          rentType: '',
           currentDisposePerson: '',
           isInvoice: '',
           invoiceDate: '',

+ 3 - 3
src/views/modules/program/registered/ProjectList.vue

@@ -149,10 +149,10 @@
               <!--管理员角色登记完成后可删除-->
               <el-button v-if="hasPermission('program:registered:del')&&scope.row.status === '5' && isAdmin" type="text" size="small" @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 === createName" type="text" size="small" @click="saveReportNo(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 === createName" type="text" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>-->
 
-              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
-              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)" type="text" size="small" @click="firstAuditReback(scope.row)">校审撤回</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&scope.row.createBy === createName" type="text" size="small" @click="firstAuditReback(scope.row)">校审撤回</el-button>
 
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.status1 === '5'&&(scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3'||scope.row.status2 === '4')" type="text" size="small" @click="secondAuditPush(scope.row)">二级校审</el-button>
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status2 === '2'&&scope.row.createBy === createName" type="text" size="small" @click="secondAuditReback(scope.row)">校审撤回</el-button>

+ 93 - 10
src/views/modules/program/registered/RegisItemForm.vue

@@ -162,14 +162,23 @@
                           :rules="[
                           {required: true, message:'评估对象不能为空', trigger:'blur'}
                  ]">
-              <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('project_assessment_object')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+              <el-input v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable></el-input>
+<!--              <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">-->
+<!--                <el-option-->
+<!--                  v-for="item in $dictUtils.getDictList('project_assessment_object')"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估范围" prop="assessmentRange"
+                          :rules="[
+                          {required: true, message:'评估范围不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.assessmentRange" placeholder="请输入评估范围" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -460,6 +469,20 @@
           </el-col>
 
           <el-col :span="12">
+            <el-form-item label="是否生成报告号" prop="generateReportNumber"
+                          :rules="[
+                 ]">
+              <el-switch
+                v-model="inputForm.generateReportNumber"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-text="否"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
             <el-form-item label="预计出报告时间" prop="reportingDate"
                           :rules="[
                           {required: true, message:'预计出报告时间不能为空', trigger:'blur'}
@@ -718,6 +741,7 @@
           industry: '', // 所属行业
           enterpriseType: '', // 企业类型
           riskLevel: '', // 风险等级
+          generateReportNumber: true, // 是否生成报告号
           projectSource: '', // 项目来源
           estimate: '', // 预估收入(元)
           planEndTime: '', // 计划完成时间
@@ -736,6 +760,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -839,6 +864,7 @@
           industry: '', // 所属行业
           enterpriseType: '', // 企业类型
           riskLevel: '', // 风险等级
+          generateReportNumber: '', // 是否生成报告号
           projectSource: '', // 项目来源
           estimate: '', // 预估收入(元)
           planEndTime: '', // 计划完成时间
@@ -857,6 +883,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -886,6 +913,11 @@
           this.programProjectListInfoService.queryById(this.inputForm.id).then(({data}) => {
             this.$refs.uploadComponent.clearUpload()
             this.inputForm = this.recover(this.inputForm, data)
+            if (data.generateReportNumber === 'true') {
+              this.inputForm.generateReportNumber = true
+            } else if (data.generateReportNumber === 'false') {
+              this.inputForm.generateReportNumber = false
+            }
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
             if (this.commonJS.isEmpty(this.inputForm.files)) {
               this.inputForm.files = []
@@ -1026,6 +1058,7 @@
               }
             })
           }
+          console.log('this.inputForm.generateReportNumber', this.inputForm.generateReportNumber)
           this.inputForm.files = this.$refs.uploadComponent.getDataList()
           this.programProjectListInfoService.saveForm(this.inputForm).then(({data}) => {
             callback(data.businessTable, data.businessId, this.inputForm)
@@ -1123,6 +1156,7 @@
               this.loading = false
               return
             }
+            console.log('this.inputForm.generateReportNumber', this.inputForm.generateReportNumber)
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
             this.programProjectListInfoService.saveForm(this.inputForm).then(({data}) => {
               callback(data.businessTable, data.businessId, this.inputForm)
@@ -1301,6 +1335,7 @@
           industry: '', // 所属行业
           enterpriseType: '', // 企业类型
           riskLevel: '', // 风险等级
+          generateReportNumber: '', // 是否生成报告号
           projectSource: '', // 项目来源
           estimate: '', // 预估收入(元)
           planEndTime: '', // 计划完成时间
@@ -1319,6 +1354,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -1441,8 +1477,55 @@
     }
   }
 </script>
-<style scoped>
-  /deep/ .el-input-number .el-input__inner {
+<style lang="scss">
+  .el-input-number .el-input__inner {
     text-align: left;
   }
+  /**
+  设置框
+   */
+  .el-switch__core{
+    width: 70px!important;
+    height: 30px;
+  }
+  /**
+  设置园
+   */
+  .el-switch__core::after{
+    width: 14px;
+    height: 14px;
+    margin-top: -1px;
+    margin-bottom: 2px;
+  }
+
+  .el-switch__label--left {
+    position: relative;
+    left: 45px;
+    color: #fff;
+    z-index: -1111;
+  }
+  .el-switch__core{
+    width: 50px !important;
+  }
+  .el-switch__label--right {
+    position: relative;
+    right: 46px;
+    color: #fff;
+    z-index: -1111;
+  }
+  .el-switch__label--right.is-active {
+    z-index: 1111;
+    color: #fff !important;
+  }
+  .el-switch__label--left.is-active {
+    z-index: 1111;
+    color: #9c9c9c !important;
+  }
+  .el-switch__label * {
+    line-height: 1;
+    font-size: 18px;
+    display: inline-block;
+  }
+
+
 </style>