Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

package-lock.json

@@ -4281,7 +4281,7 @@
     "fastclick": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
-      "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==",
+      "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=",
       "dev": true
     },
     "fastparse": {
@@ -4436,7 +4436,7 @@
     "font-awesome.css": {
       "version": "4.7.2",
       "resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz",
-      "integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA=="
+      "integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI="
     },
     "for-in": {
       "version": "1.0.2",
@@ -12355,7 +12355,7 @@
     "vue-html5-editor": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz",
-      "integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==",
+      "integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=",
       "dev": true
     },
     "vue-lazyload": {

src/views/contracted/index.vue

@@ -110,17 +110,17 @@
     },
     created() {
       this.getUserInfo();
-      this.getList();
     },
     methods: {
       getUserInfo() {
         getInfo().then(response => {
           this.nickName = response.user.nickName;
           this.phone = response.user.phonenumber;
+          this.getList(response.user.userId);
         });
       },
-      getList(){
-        listSurveyTask().then(response => {
+      getList(userId){
+        listSurveyTask({userId: userId}).then(response => {
           this.surveyTask = response.data;
         });
       },

src/views/contracted/village/contractor/contractor.vue

@@ -61,7 +61,7 @@
               <div class="opera_btn view" v-if="surveyStatus === '2'" @click="handleViewRemark(item.id)">
                 <p>挂起原因</p>
               </div>
-              <div class="opera_btn delete" v-if="taskStatus === '2'" @click="deleteContractor(item.id, index)">
+              <div class="opera_btn delete" v-if="taskStatus === '2' && surveyStatus !== '3'" @click="deleteContractor(item.id, index)">
                 <p>删除</p>
               </div>
             </div>

src/views/sunVillage_info/list_signature.vue

@@ -36,7 +36,7 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.attachement != null && item.firstIsSign =='否'" @click="openPopup(item.id)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>

src/views/user/signature/signatureList.vue

@@ -35,7 +35,7 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" @click="openPopup(item.id)" v-if="item.signingMode == '线上' && item.secondIsSign =='否' ">
+              <div class="opera_btn" @click="openPopup(item.id)" v-if="item.signingMode == '线上' && item.attachement != null && item.secondIsSign =='否' ">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>