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

src/components/personalForms/landCertificate.vue

@@ -7,8 +7,8 @@
             <el-row class="row-style">
               <el-col :xs="24" :sm="12" :lg="8" :span="6">
                 <el-form-item label="国有土地使用证类型：" prop="certificateType" label-width="180px"
-                  class="postInfo-container-item">
-                  <el-radio-group v-model="certificate.certificateType" size="small">
+                  class="postInfo-container-item" :rules="{ required: true, message: '使用证类型不能为空', trigger: 'blur' }">
+                  <el-radio-group  v-model="certificate.certificateType" size="small">
                     <el-radio border label="分户">分户</el-radio>
                     <el-radio border label="大证">大证</el-radio>
                   </el-radio-group>

src/views/major/myOrder.vue

@@ -44,7 +44,7 @@
         </el-table-column>
         <el-table-column label="当前节点" align="center" width='200'>
           <template slot-scope="{row}">
-            <span>{{ row.currentNodeName == null ? (row.ifSaveFile === true ? '已归档' : '撰写节点') : row.currentNodeName
+            <span>{{ row.currentNodeName == null ? (row.ifSaveFile === true ? '已归档' : '--') : row.currentNodeName
             }}</span>
           </template>
         </el-table-column>

src/views/major/todoDetail.vue

@@ -802,6 +802,22 @@
                         </el-date-picker>
                       </el-form-item>
                     </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="props.row.production != 'REPORT'">
+                      <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-option label="其他" value="其他"></el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="props.row.production != 'STATEMENT'">
                       <el-form-item prop="signatoryId"
                         :rules="{ required: (props.row.production === 'REPORT'), message: '签字人不能为空', trigger: 'blur' }"
@@ -885,17 +901,17 @@
                     <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="140px"
-                        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>
+                        :class="['postInfo-container-item','reason']">
+                        <el-radio v-model="props.row.isSubmit" :label="true" size="medium" @change="saveProduction(props.row)">是</el-radio>
+                        <el-radio v-model="props.row.isSubmit" :label="false" size="medium" @change="saveProduction(props.row)">否</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','reason']">
-                        <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-radio v-model="props.row.isRecord" :label="true" size="medium" @change="saveProduction(props.row)">是</el-radio>
+                        <el-radio v-model="props.row.isRecord" :label="false" size="medium" @change="saveProduction(props.row)">否</el-radio>
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="18" :span="6" v-if="major.businessObjectType === '土地' && !props.row.isRecord">
@@ -1669,7 +1685,10 @@
           <el-radio v-for="(checker, index) in secondCheckUsers" :label="checker.remark">{{ checker.name }}</el-radio>
         </el-radio-group>
       </div>
-      <span slot="footer" class="dialog-footer">
+      <div style="margin-top: 30px;color: red;font-weight: bold">
+          <span v-if="this.productions[0].production==='REPORT' && !this.productions[0].isRecord && this.major.businessObjectType==='土地'">此报告为土地不备案报告，请知晓！</span>
+     </div>
+        <span slot="footer" class="dialog-footer">
         <el-button @click="chooseSecondCheckerDialog = false">取消</el-button>
         <el-button type="primary" @click="commit('PASS')" :disabled="!secondCheckUserId">确定</el-button>
       </span>
@@ -1687,7 +1706,7 @@
         <el-button type="primary" @click="doMergeNo()" :disabled="!toMergeNo">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :visible.sync="notRecordDialog" width="45%" center top="35vh" custom-class="doWarehouseClass">
+    <el-dialog :visible.sync="notRecordDialog" width="45%" center top="35vh" custom-class="doWarehouseClass" @closed="remindClean()">
       <el-divider content-position="left">
           <h3 >
             <div style="color: red;"><i class="el-icon-warning"></i> 不备案提醒</div>
@@ -1717,8 +1736,28 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="notRecordDialog=false">不通过</el-button>
-        <el-button type="primary" @click="doPassNotRecord()">通过</el-button>
+        <el-button @click="notRecordDialog=false">暂不处理</el-button>
+        <el-button type="primary" @click="doPassNotRecord()">已知晓</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog :visible.sync="notSubmitDialog" width="45%" center top="35vh" custom-class="doWarehouseClass" @closed="remindClean()">
+      <el-divider content-position="left">
+          <h3 >
+            <div style="color: red;"><i class="el-icon-warning"></i> 上报协会提醒</div>
+          </h3>
+      </el-divider>
+      <el-form ref="notRecordFrom" v-model="notSubmitRemind">
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="6">
+            <el-form-item  label-width="45px" :class="['postInfo-container-item','reason']">
+              <el-input :value="notSubmitRemind.reportNo +'  报告需要上报协会！'" :class="['filter-item','resaon_input']" disabled readonly style=" width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="notSubmitDialog=false">暂不处理</el-button>
+        <el-button type="primary" @click="doPassNotSubmit()">已知晓</el-button>
       </span>
     </el-dialog>
   </div>
@@ -2103,7 +2142,13 @@ export default {
         reportNo:null,
         isRecord:null,
         notRecordReason:null
-      }
+      },
+      notSubmitDialog:false,
+      notSubmitRemind:{
+        reportNo:null,
+        isSubmit:null,
+      },
+      passNotSubmit:false
     }
   },
   created() {
@@ -2896,7 +2941,7 @@ export default {
     saveProduction(production) {
       //判断当前节点，确定调用后端接口
       let nodeCode = this.currentNode.nodeCode;
-      production.evaluateAmount = production.evaluateAmount*10000;
+      
       switch (nodeCode) {
         case 'WRITE_STATEMENT':
         case 'WRITE_REPORT':
@@ -3016,6 +3061,7 @@ export default {
       if (prodFrom) {
         prodFrom.validate(valid => {
           if (valid) {
+            production.evaluateAmount = production.evaluateAmount*10000;
             if (production.id) {
               this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
               this.taskRecordDTO.taskData = production;
@@ -3196,6 +3242,7 @@ export default {
       verify.state = true;
       verify.nextHandlerId = this.secondCheckUserId;
       verify.passNotRecord = this.passNotRecord;
+      verify.passNotSubmit = this.passNotSubmit;
       let nodeCode = this.currentNode.nodeCode;
       if (commit.state === 'PASS') {
         this.getProductions(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
@@ -3354,13 +3401,20 @@ export default {
             break;
           case "RECHECK_REPORT":
           case "THIRD_CHECK_REPORT":
-            if (!verify.passNotRecord && this.major.businessObjectType==='土地'){
+            if (!this.productions[0].isRecord && !verify.passNotRecord && this.major.businessObjectType==='土地'){
               verify.state = false;
               callback(verify);
               this.notRecordRemind = this.productions[0];
               this.notRecordDialog = true;
               return;
             }
+            if (this.productions[0].isSubmit && !verify.passNotSubmit && this.major.businessObjectType==='房地产'){
+              verify.state = false;
+              callback(verify);
+              this.notSubmitRemind = this.productions[0];
+              this.notSubmitDialog = true;
+              return;
+            }
             break;
           case "INITIAL_PRICE":
             let notEvaluateValueTargets = this.evaluateLandData.filter(function (e) {
@@ -3703,7 +3757,7 @@ export default {
         }
       })
     },
-    printQR() {
+    printQR(path) {
       if (path){
           let routeUrl = this.$router.resolve({
             path: `/print/code?path=${path}`
@@ -3893,6 +3947,14 @@ export default {
     doPassNotRecord(){
       this.passNotRecord = true;
       this.commit('PASS');
+    },
+    doPassNotSubmit(){
+      this.passNotSubmit = true;
+      this.commit('PASS');
+    },
+    remindClean(){
+      this.passNotRecord = false;
+      this.passNotSubmit = false;
     }
   },
 }

src/views/personal/todoDetail.vue

@@ -2231,6 +2231,19 @@ export default {
                 }
                 this.finalReprotProd.files = fs;
               }
+              if (word.production === 'LETTER') {
+                this.letterReprotProd = word;
+                const fs = [];
+                if (word.filePath) {
+                  const final = JSON.parse(word.filePath)
+                  final.id = word.id;
+                  this.letterCardPNG = existPNG;
+                  fs.push(final);
+                } else {
+                  this.letterCardPNG = emptyPNG;
+                }
+                this.letterReprotProd.files = fs;
+              }
             });
           }
         })