Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/views/menu/resumption/detail.vue

@@ -173,26 +173,6 @@
                 </template>
               </van-cell>
               <van-cell-group v-show="point.resValue">
-                <select-cell
-                  :required="enable"
-                  :disabled="!enable"
-                  title="整改期限"
-                  name="rectificationDeadline"
-                  v-model="point.rectificationDeadline"
-                  :data-list="dayList"
-                />
-                <van-field
-                  :rules="[{ required: enable, message: '请输入情况描述' },{validator, message: '输入长度200字符以内'}]"
-                  :required="enable"
-                  v-model="point.resRemark"
-                  :readonly="!enable"
-                  rows="1"
-                  name="resRemark"
-                  autosize
-                  label="情况描述"
-                  type="textarea"
-                  :placeholder="enable ? '请输入情况描述' : ''"
-                />
                 <div class="upload-box">
                   <uploader :maxCount="5" v-if="enable" v-model="point.imgs" />
                   <van-cell v-else>
@@ -207,13 +187,34 @@
                     </div>
                   </van-cell>
                 </div>
+                <van-field
+                  :rules="[{ required: enable, message: '请输入情况描述' },{validator, message: '输入长度200字符以内'}]"
+                  :required="enable"
+                  v-model="point.resRemark"
+                  :readonly="!enable"
+                  rows="1"
+                  name="resRemark"
+                  autosize
+                  autofocus="true"
+                  label="情况描述"
+                  type="textarea"
+                  :placeholder="enable ? '请输入情况描述' : ''"
+                />
+                <select-cell
+                  :required="enable"
+                  :disabled="!enable"
+                  title="整改期限"
+                  name="rectificationDeadline"
+                  v-model="point.rectificationDeadline"
+                  :data-list="dayList"
+                />
               </van-cell-group>
             </div>
           </van-collapse-item>
         </van-collapse>
       </div>
 
-      <div class="bottomClass" v-if="enable">
+      <div class="bottomClass" v-if="enable" v-show="showButton" >
         <van-row>
           <van-col span="8">
             <van-button type="primary" @click="clickNFC">扫描NFC</van-button>
@@ -288,6 +289,7 @@ export default {
       loading: false,
       finished: false,
       selectArea: null,
+      showButton:true,
       preViewImages: {
         images: [],
         startPosition: 0
@@ -309,6 +311,14 @@ export default {
     })
   },
   methods: {
+    showButtoFun(vel){
+      if( val === 1){
+        this.showButton = false;
+      }
+      if(val === 2){
+        this.showButton = true;
+      }
+    },
     //长度校验
     validator(val) {
       let len = val.length;