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

src/components/personalForms/backgroundInfo.vue

@@ -263,7 +263,7 @@ export default {
         cityParks: null,
         badFactors: '无',
         bgEnvir: '所在区域废气、噪音污染不明显，街道较整洁，绿化率较高，整体环境较好',
-        bgBase: '估价对象区域基础设施完善，已实现“六通”（ 通上下水、电、气、讯、道路），区域基础设施完善。'
+        bgBase: '估价对象区域基础设施完善，已实现“六通”（通上下水、电、气、讯、道路），区域基础设施完善。'
       },
     }
 

src/components/personalForms/immovableCertificate.vue

@@ -200,7 +200,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row class="row-style">
+            <!-- <el-row class="row-style">
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="农商行项目：" prop="isNoneShangCase" label-width="140px" class="postInfo-container-item">
                   <el-radio-group v-model="certificate.isNoneShangCase" size="small">
@@ -217,7 +217,7 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
           </div>
         </div>
       </el-form>
@@ -350,29 +350,7 @@ export default {
         })
       }
     },
-    converteUseTo(arr) {
-      if (arr) {
-        this.certificate.useTo = "";
-        arr.forEach(element => {
-          if (element === 'OFFICE') {
-            this.certificate.useTo += '办公 '
-          }
-          if (element === 'HOUSE') {
-            this.certificate.useTo += '住宅 '
-          }
-          if (element === 'BUSINESS') {
-            this.certificate.useTo += '商业 '
-          }
-          if (element === 'INDUSTRIAL') {
-            this.certificate.useTo += '工业 '
-          }
-          if (element === 'OTHER') {
-            this.certificate.useTo += '其他 '
-          }
-        });;
-      }
-
-    },
+   
     refreshLinkAttributes(){
       if (this.immovableCertificateObject == null) {
           this.certificate.location = this.linkAttributes.location;
@@ -381,9 +359,8 @@ export default {
           this.certificate.bailor1Tel = this.linkAttributes.bailor1Tel;
           this.certificate.bailor2 = this.linkAttributes.bailor2;
           this.certificate.bailor2Tel = this.linkAttributes.bailor2Tel;
-          this.certificate.acreage =this.linkAttributes.acreage;
           this.certificate.ownerName = this.linkAttributes.ownerName;
-          this.converteUseTo(this.linkAttributes.purpose);
+          
         }
     },
     // 组件事件

src/components/personalForms/sellingAbilityInfo.vue

@@ -301,7 +301,8 @@ export default {
         createDate: null,
         sceneDateD: null,
         createDateD: new Date(),
-        limitDate: null
+        limitDate: null,
+        maxDate:null
       },
       outwardStaffs: [],
 
@@ -315,6 +316,7 @@ export default {
           if (valid) {
             this.sellingAbilityInfo.createDate = moment(this.sellingAbilityInfo.createDateD).format('YYYY年MM月DD日');
             this.sellingAbilityInfo.sceneDate = moment(this.sellingAbilityInfo.sceneDateD).format('YYYY年MM月DD日');
+            this.sellingAbilityInfo.maxDate = moment(this.sellingAbilityInfo.limitDate.split("至")[1].trim()).format('YYYY年MM月DD日');
             this.$api.personalTarget.updateSellingAbility(this.sellingAbilityInfo).then(res => {
               if (res.code === 200 && res.data) {
                 this.$notify({

src/views/finance/fundList.vue

@@ -524,7 +524,7 @@ export default {
               } else {
                 return prev;
               }
-            }, 0);
+            }, 0).toFixed(2);
             sums[index] += ' 元';
           } else {
             sums[index] = '-';

src/views/finance/invoiceCheck.vue

@@ -902,7 +902,7 @@ export default {
               } else {
                 return prev;
               }
-            }, 0);
+            }, 0).toFixed(2);
             sums[index] += ' 元';
           } else {
             sums[index] = '-';

src/views/personal/todoDetail.vue

@@ -861,9 +861,9 @@
               <time class="time">{{ technicReportProd.modified }}</time>
               <div class="control">
                 <el-button type="text" class="button" @click="doStamp(technicReportProd.files)"
-                  :disabled="currentNode.nodeCode != 'WRITE_REPORT'">加盖公章</el-button>
+                  :disabled="!technicReportProd.isOnline">加盖公章</el-button>
                 <el-button type="text" class="button" @click="genProductionFile(2)"
-                  :disabled="currentNode.nodeCode != 'WRITE_REPORT'">系统生成</el-button>
+                  >系统生成</el-button>
               </div>
             </div>
             <el-upload style="position: relative; top: -10px; padding: 10px;"
@@ -871,7 +871,7 @@
               :limit="1" :on-exceed="handleExceed" :on-preview="handleAttachmentPreview" :on-success="getProductions"
               :before-remove="handleRemoveFile">
               <el-button type="text" style="position: relative; left: 10px;top: -4px;"
-                :disabled="currentNode.nodeCode != 'WRITE_REPORT'">手动上传</el-button>
+                >手动上传</el-button>
             </el-upload>
           </el-card>
           <el-card :body-style="{ padding: '0px' }" shadow="always" style="margin-left: 5%; margin-right: 5%;width: 20%;"
@@ -884,9 +884,9 @@
               <time class="time">{{ finalReprotProd.modified }}</time>
               <div class="control">
                 <el-button type="text" class="button" @click="doStamp(finalReprotProd.files)"
-                  :disabled="currentNode.nodeCode != 'WRITE_REPORT'">加盖公章</el-button>
+                  :disabled="!finalReprotProd.isOnline">加盖公章</el-button>
                 <el-button type="text" class="button" @click="genProductionFile(3)"
-                  :disabled="currentNode.nodeCode != 'WRITE_REPORT'">系统生成</el-button>
+                  >系统生成</el-button>
               </div>
             </div>
             <el-upload style="position: relative; top: -10px;padding: 10px;"
@@ -894,7 +894,7 @@
               :on-exceed="handleExceed" :on-preview="handleAttachmentPreview" :on-success="getProductions"
               :before-remove="handleRemoveFile">
               <el-button type="text" style="position: relative; left: 10px;top: -4px;"
-                :disabled="currentNode.nodeCode != 'WRITE_REPORT'">手动上传</el-button>
+               >手动上传</el-button>
             </el-upload>
           </el-card>
           <el-card :body-style="{ padding: '0px' }" shadow="always" style="margin-left: 5%; margin-right: 5%;width: 20%;"
@@ -913,7 +913,7 @@
               :limit="1" :on-exceed="handleExceed" :on-preview="handleAttachmentPreview" :on-success="getProductions"
               :before-remove="handleRemoveFile">
               <el-button type="text" style="position: relative; left: 10px;top: -4px;"
-                :disabled="currentNode.nodeCode != 'WRITE_LETTER'">手动上传</el-button>
+                >手动上传</el-button>
             </el-upload>
           </el-card>
         </div>