Explorar el Código

Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

GouGengquan hace 10 meses
padre
commit
bd68098736
Se han modificado 3 ficheros con 266 adiciones y 12 borrados
  1. 25 0
      src/api/modules/userArchive.js
  2. 83 4
      src/views/major/detail.vue
  3. 158 8
      src/views/major/todoDetail.vue

+ 25 - 0
src/api/modules/userArchive.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+/*
+* 员工档案
+*/
+export default {
+
+  detail(params) {
+    return request.get(`userArchive/${params}`)
+  },
+  add(params) {
+    return request.post(`userArchive`, params)
+  },
+  edit(params) {
+    return request.put(`userArchive`, params)
+  },
+  list(){
+    return request.get(`userArchive`)
+  },
+  remove(){
+    return request.delete(`userArchive/${params}`)
+  },
+  getRegistrationNoByUserId(params){
+    return request.get(`userArchive/registrationNo/${params}`)
+  }
+}

+ 83 - 4
src/views/major/detail.vue

@@ -1032,7 +1032,7 @@
                                 style="width:100%"
                               class="filter-item">
                               <template slot="append">
-                                <span>元</span>
+                                <span>元</span>
                               </template>
                             </el-input>
                         </el-form-item>
@@ -1060,7 +1060,7 @@
                                 style="width:100%"
                                 class="filter-item" >
                                 <template slot="append">
-                                  <span>元</span>
+                                  <span>元</span>
                                 </template>
                               </el-input>
                           </el-form-item>
@@ -1106,6 +1106,85 @@
                     </el-col>
                   
                   </el-row>
+                  <el-row class="row-style" v-if="props.row.production==='REPORT'">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="workStartDate" :rules="{ required: true, message: '估价作业开始日期不能为空', trigger: 'blur' }"
+                        label-width="180px" class="postInfo-container-item" label="估价作业开始日期:">
+                        <el-date-picker v-model="props.row.workStartDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%"  disabled readonly>
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="workEndDate" :rules="{ required: true, message: '估价作业结束日期不能为空', trigger: 'blur' }"
+                        label-width="180px" class="postInfo-container-item" label="估价作业结束日期:">
+                        <el-date-picker v-model="props.row.workEndDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%"  disabled readonly>
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item label="评估目的:" prop="workPurpose"
+                        :rules="{ required: true, message: '估价目的不能为空', trigger: 'blur' }" label-width="120px"
+                        class="postInfo-container-item">
+                        <el-select v-model="props.row.workPurpose" placeholder="请选择" style=" width: 100%" filterable default-first-option allow-create  disabled readonly                    >
+                          <el-option label="抵押" value="抵押"></el-option>
+                          <el-option label="咨询" value="咨询"></el-option>
+                          <el-option label="融资" value="融资"></el-option>
+                          <el-option label="司法" value="司法"></el-option>
+                          <el-option label="可行性研究" value="可行性研究"></el-option>
+                          <el-option label="不良资产价值评估" value="不良资产价值评估"></el-option>
+                          <el-option label="其他" value="其他"></el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row class="row-style" v-if="props.row.production==='REPORT'">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.businessObjectType === '房地产'">
+                      <el-form-item label="是否上报协会:" prop="isSubmit"
+                        :rules="{ required: true, message: '是否上报协会不能为空', trigger: 'blur' }" label-width="120px"
+                        class="postInfo-container-item">
+                        <el-radio v-model="props.row.isSubmit" :label="true" size="medium"  disabled readonly>是</el-radio>
+                        <el-radio v-model="props.row.isSubmit" :label="false" size="medium"  disabled readonly>否</el-radio>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.businessObjectType === '土地'">
+                      <el-form-item label="是否备案:" prop="isRecord"
+                        :rules="{ required: true, message: '是否备案不能为空', trigger: 'blur' }" label-width="120px"
+                        class="postInfo-container-item">
+                        <el-radio v-model="props.row.isRecord" :label="true" size="medium"  disabled readonly>是</el-radio>
+                        <el-radio v-model="props.row.isRecord" :label="false" size="medium"  disabled readonly>否</el-radio>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="mainWorker" label-width="120px" class="postInfo-container-item"
+                        label="第一报告人:">
+                        <el-input :value="props.row.mainWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.mainWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="minorWorker" label-width="120px" class="postInfo-container-item"
+                        label="第二报告人:">
+                        <el-input :value="props.row.minorWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.minorWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="smallWorker" label-width="120px" class="postInfo-container-item"
+                        label="第三报告人:">
+                        <el-input :value="props.row.smallWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.smallWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="18" :span="6">
                         <el-form-item  prop="comment"
@@ -1148,7 +1227,7 @@
           <el-table-column
             label="项目名称"
             prop="name"
-            align="center">
+            align="center" show-overflow-tooltip>
             <template slot-scope="props">
                 <span style="font-size:16px">{{props.row.name}}</span>
             </template>
@@ -2331,7 +2410,7 @@
               }
             }
             for (let d in newValue){
-              newValue[d].evaluatePrice = ((newValue[d].evaluateAmount)/(newValue[d].evaluateAcreage)).toFixed(0);
+              newValue[d].evaluatePrice = ((newValue[d].evaluateAmount)/(newValue[d].evaluateAcreage)).toFixed(4);
             }
         },
         deep: true

+ 158 - 8
src/views/major/todoDetail.vue

@@ -162,6 +162,7 @@
                           <el-option label="抵押" value="抵押"></el-option>
                           <el-option label="咨询" value="咨询"></el-option>
                           <el-option label="融资" value="融资"></el-option>
+                          <el-option label="司法" value="司法"></el-option>
                           <el-option label="可行性研究" value="可行性研究"></el-option>
                           <el-option label="不良资产价值评估" value="不良资产价值评估"></el-option>
                           <el-option label="其他" value="其他"></el-option>
@@ -758,7 +759,7 @@
                         label="评估总价:">
                         <el-input v-model="props.row.evaluateAmount" style="width:100%" class="filter-item">
                           <template slot="append">
-                            <span>元</span>
+                            <span>元</span>
                           </template>
                         </el-input>
                       </el-form-item>
@@ -779,7 +780,7 @@
                         <el-input v-model="props.row.evaluatePrice" style="width:100%" readonly disabled
                           class="filter-item">
                           <template slot="append">
-                            <span>元</span>
+                            <span>元</span>
                           </template>
                         </el-input>
                       </el-form-item>
@@ -795,7 +796,7 @@
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item prop="valueTiming" :rules="{ required: true, message: '价值时点不能为空', trigger: 'blur' }"
                         label-width="120px" class="postInfo-container-item" label="价值时点:">
-                        <el-date-picker v-model="props.row.valueTiming" type="date" placeholder="选择日期" style="width:100%">
+                        <el-date-picker v-model="props.row.valueTiming" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%">
                         </el-date-picker>
                       </el-form-item>
                     </el-col>
@@ -804,7 +805,7 @@
                         :rules="{ required: (props.row.production === 'REPORT'), message: '签字人不能为空', trigger: 'blur' }"
                         label-width="120px" class="postInfo-container-item" label="签字人:">
                         <el-select v-model="props.row.signatoryId" placeholder="产品类型为报告,签字人必填" filterable multiple
-                          clearable style=" width: 100%">
+                          clearable style=" width: 100%" @change="findWorker(props.row)">
                           <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id"></el-option>
                         </el-select>
                       </el-form-item>
@@ -814,8 +815,88 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
+
+                  <el-row class="row-style" v-if="props.row.production==='REPORT'">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="workStartDate" :rules="{ required: true, message: '估价作业开始日期不能为空', trigger: 'blur' }"
+                        label-width="180px" class="postInfo-container-item" label="估价作业开始日期:">
+                        <el-date-picker v-model="props.row.workStartDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%">
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="workEndDate" :rules="{ required: true, message: '估价作业结束日期不能为空', trigger: 'blur' }"
+                        label-width="180px" class="postInfo-container-item" label="估价作业结束日期:">
+                        <el-date-picker v-model="props.row.workEndDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%">
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item label="评估目的:" prop="workPurpose"
+                        :rules="{ required: true, message: '估价目的不能为空', trigger: 'blur' }" label-width="120px"
+                        class="postInfo-container-item">
+                        <el-select v-model="props.row.workPurpose" placeholder="请选择" style=" width: 100%" filterable default-first-option allow-create                        >
+                          <el-option label="抵押" value="抵押"></el-option>
+                          <el-option label="咨询" value="咨询"></el-option>
+                          <el-option label="融资" value="融资"></el-option>
+                          <el-option label="司法" value="司法"></el-option>
+                          <el-option label="可行性研究" value="可行性研究"></el-option>
+                          <el-option label="不良资产价值评估" value="不良资产价值评估"></el-option>
+                          <el-option label="其他" value="其他"></el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row class="row-style" v-if="props.row.production==='REPORT'">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.businessObjectType === '房地产'">
+                      <el-form-item label="是否上报协会:" prop="isSubmit"
+                        :rules="{ required: true, message: '是否上报协会不能为空', trigger: 'blur' }" label-width="120px"
+                        class="postInfo-container-item">
+                        <el-radio v-model="props.row.isSubmit" :label="true" size="medium">是</el-radio>
+                        <el-radio v-model="props.row.isSubmit" :label="false" size="medium">否</el-radio>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.businessObjectType === '土地'">
+                      <el-form-item label="是否备案:" prop="isRecord"
+                        :rules="{ required: true, message: '是否备案不能为空', trigger: 'blur' }" label-width="120px"
+                        class="postInfo-container-item">
+                        <el-radio v-model="props.row.isRecord" :label="true" size="medium">是</el-radio>
+                        <el-radio v-model="props.row.isRecord" :label="false" size="medium">否</el-radio>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="mainWorker" label-width="120px" class="postInfo-container-item"
+                        label="第一报告人:">
+                        <el-input :value="props.row.mainWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.mainWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="minorWorker" label-width="120px" class="postInfo-container-item"
+                        label="第二报告人:">
+                        <el-input :value="props.row.minorWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.minorWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="smallWorker" label-width="120px" class="postInfo-container-item"
+                        label="第三报告人:">
+                        <el-input :value="props.row.smallWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.smallWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
                   <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="18" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
                       <el-form-item prop="comment" label-width="120px" class="postInfo-container-item" label="特殊情况说明:">
                         <el-input v-model.trim="props.row.comment" class="filter-item" />
                       </el-form-item>
@@ -860,7 +941,7 @@
               <span style="color:rgb(131,201,94); font-weight:bold">{{ props.row.reportNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="项目名称" prop="name" align="center">
+          <el-table-column label="项目名称" prop="name" align="center" show-overflow-tooltip>
             <template slot-scope="props">
               {{ props.row.name }}
             </template>
@@ -1658,7 +1739,7 @@ export default {
     productions: {
       handler(newValue, oldVal) {
         for (let d in newValue) {
-          newValue[d].evaluatePrice = ((newValue[d].evaluateAmount) / (newValue[d].evaluateAcreage)).toFixed(0);
+          newValue[d].evaluatePrice = ((newValue[d].evaluateAmount) / (newValue[d].evaluateAcreage)).toFixed(4);
         }
       },
       deep: true
@@ -2605,7 +2686,7 @@ export default {
         production.name = this.major.name;
         production.statementNo = this.takeNumberItems[0].name;
         if (totalAcreage != 0) {
-          production.evaluatePrice = (totalAmount * 10000 / totalAcreage).toFixed(0);
+          production.evaluatePrice = (totalAmount * 10000 / totalAcreage).toFixed(4);
         } else {
           production.evaluatePrice = 0;
         }
@@ -2703,6 +2784,7 @@ export default {
     saveProduction(production) {
       //判断当前节点,确定调用后端接口
       let nodeCode = this.currentNode.nodeCode;
+      production.evaluateAmount = production.evaluateAmount*10000;
       switch (nodeCode) {
         case 'WRITE_STATEMENT':
         case 'WRITE_REPORT':
@@ -3511,6 +3593,74 @@ export default {
     },
     showQrCode(url){
       this.qrCodeUrl = url;
+    },
+    findWorker(row){
+      console.log(row.signatoryId);
+      if (row.signatoryId.length===0){
+          row.mainWorker = null;
+          row.mainWorkerNo = null;
+          row.minorWorker = null;
+          row.minorWorkerNo = null;
+          row.smallWorker = null;
+          row.smallWorkerNo = null;
+      }
+      if (row.signatoryId.length === 1){
+        let mainWorkerId = row.signatoryId[0];
+        this.$api.userArchive.getRegistrationNoByUserId(mainWorkerId).then(res=>{
+          if (res.code===200){
+              row.mainWorker = res.data.evaluatorName;
+              row.mainWorkerNo = res.data.majorEvaluatorRegistrationNo;
+          }
+        })
+        row.minorWorker = null;
+        row.minorWorkerNo = null;
+        row.smallWorker = null;
+        row.smallWorkerNo = null;
+      }
+      if (row.signatoryId.length === 2){
+        let mainWorkerId = row.signatoryId[0];
+        this.$api.userArchive.getRegistrationNoByUserId(mainWorkerId).then(res=>{
+          if (res.code===200){
+              row.mainWorker = res.data.evaluatorName;
+              row.mainWorkerNo = res.data.majorEvaluatorRegistrationNo;
+          }
+        })
+        let minorWorkerId = row.signatoryId[1];
+        this.$api.userArchive.getRegistrationNoByUserId(minorWorkerId).then(res=>{
+          if (res.code===200){
+              row.minorWorker = res.data.evaluatorName;
+              row.minorWorkerNo = res.data.majorEvaluatorRegistrationNo;
+          }
+        })
+        row.smallWorker = null;
+        row.smallWorkerNo = null;
+      }
+      if (row.signatoryId.length ===3){
+        let mainWorkerId = row.signatoryId[0];
+        this.$api.userArchive.getRegistrationNoByUserId(mainWorkerId).then(res=>{
+          if (res.code===200){
+              row.mainWorker = res.data.evaluatorName;
+              row.mainWorkerNo = res.data.majorEvaluatorRegistrationNo;
+          }
+        })
+        let minorWorkerId = row.signatoryId[1];
+        this.$api.userArchive.getRegistrationNoByUserId(minorWorkerId).then(res=>{
+          if (res.code===200){
+              row.minorWorker = res.data.evaluatorName;
+              row.minorWorkerNo = res.data.majorEvaluatorRegistrationNo;
+          }
+        })
+        let smallWorkerId = row.signatoryId[2];
+        this.$api.userArchive.getRegistrationNoByUserId(smallWorkerId).then(res=>{
+          if (res.code===200){
+              row.smallWorker = res.data.evaluatorName;
+              row.smallWorkerNo = res.data.majorEvaluatorRegistrationNo;
+          }
+        })
+      }
+      if (row.signatoryId.length > 3){
+        this.$message.error("签字人个数建议为2人。")
+      }
     }
   },
 }