更新

components/newArchives/residents.vue

@@ -182,6 +182,19 @@
         }
       }
     },
+    mounted() {
+      if(this.$props.readonly){
+        this.residents = this.$props.datas;
+        if(!isNaN(this.residents.child))this.residents.child = +this.residents.child;
+        this.residents.family.forEach(item=>{
+          if(!isNaN(item.situation))item.situation = +item.situation;
+        })
+        this.residents.child_arr.forEach(item=>{
+          if(!isNaN(item.feeding))item.feeding = +item.feeding;
+          if(!isNaN(item.is_lesson))item.is_lesson = +item.is_lesson;
+        })
+      }
+    },
     methods: {
       async validate() {
         return this.$refs.residentsForm.validate();

subpkg/archivesDetail/archivesDetail.vue

@@ -40,6 +40,9 @@
           <view class="item">
             <view class="title">地区信息</view>
             <!-- <districtSelector ref="districtSelectorRef" :datas="formData" :readonly="true"></districtSelector> -->
+            <u-form-item labelWidth="auto" label="地址" borderBottom>
+              <u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
+            </u-form-item>
             <u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom>
               <u--input v-model="formData.address" :readonly="readonly" placeholder="请输入详细地址"></u--input>
             </u-form-item>
@@ -72,6 +75,9 @@
       <residents v-show="current==0" ref="residentsRef" :readonly="true" :datas="formData"></residents>
       <view v-show="current==1">
         <block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
+          <view class="update_time">
+            更新时间:{{item.update_time}}
+          </view>
           <block>
             <breeding v-if="item.id==32" :datas="item.datas" :readonly="true" ref="demandRef32"></breeding>
             <plant v-if="item.id==7" :datas="item.datas" :readonly="true" ref="demandRef7"></plant>
@@ -175,6 +181,12 @@
       this.initInformationDetails({ id: options.id })
     },
     onShow() {},
+    computed:{
+    	nowAddress(){
+    		let address = this.$store.state.app.userInfo;
+    		return address.province_name+address.city_name+address.area_name+address.street_name+address.village_name+address.brigade_name;
+    	}
+    },
     methods: {
       async initInformationDetails(id) {
         let res = await informationDetails(id);
@@ -221,6 +233,11 @@
       color: #fff;
     }
   }
+  
+  .update_time{
+    padding-left: 28rpx;
+    padding-top: 28rpx;
+  }
 
   .card {
     background-color: #fff;

subpkg/companyInfo/companyInfo.vue

@@ -254,9 +254,9 @@
         }
 
         .btn {
+          flex-shrink: 0;
           font-size: 25rpx;
           font-weight: 400;
-          min-width: 80rpx;
           color: #666666;
           display: flex;
           align-items: center;

subpkg/companySign/companySign.vue

@@ -113,9 +113,9 @@
           contract_type: data.contract_type,
           type: data.type
         })
-        // Toast(res.msg || '合同已生成')
         this.initCompany();
-        uni.hideLoading()
+        uni.hideLoading();
+        Toast(res.msg || '合同已生成')
       },
       // 发送合同
       async addContract(data) {
@@ -126,7 +126,6 @@
         let res = await Draftingcontracts({
           id: this.id
         });
-        // Toast('合同已发送');
         this.initCompany();
         if (this.userInfo.contract.check_status == 3) {
           this.timerCount = 60;
@@ -139,6 +138,7 @@
           }, 1000);
         }
         uni.hideLoading();
+        Toast('合同已发送');
         this.naviTo('/subpkg/submit/submit');
       },
       // 发送短信

subpkg/companyUnsign/companyUnsign.vue

@@ -161,9 +161,9 @@ export default {
         }
 
         .btn {
+          flex-shrink: 0;
           font-size: 25rpx;
           font-weight: 400;
-          min-width: 80rpx;
           color: #666666;
           display: flex;
           align-items: center;