From 0dc60b654541614e744de14174074eadef18766c Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 19 Apr 2023 16:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/homestead/application.js            | 4 ++--
 src/views/sunVillage_info/arbitration/arbitrationDetail.vue | 4 ++--
 src/views/sunVillage_info/homeApplication/proposerLite.vue  | 5 ++---
 打包.bat                                                    | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/api/sunVillage_info/homestead/application.js b/src/api/sunVillage_info/homestead/application.js
index 9f62d6d0..48ed8968 100644
--- a/src/api/sunVillage_info/homestead/application.js
+++ b/src/api/sunVillage_info/homestead/application.js
@@ -213,9 +213,9 @@ export function getQueryLand(id) {
 }
 
 //查询当前登录账号坐标
-export function getWorkflow() {
+export function getWorkflow(deptId) {
   return request({
-    url: '/home/mobile/workflow',
+    url: '/home/mobile/workflow?deptId='+deptId,
     method: 'get'
   })
 }
diff --git a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
index b92f7173..50952b25 100644
--- a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
+++ b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
@@ -62,7 +62,7 @@
               <div>
                 <p class="main_title"><span style="color: red;">*</span>纠纷人</p>
                 <van-field :readonly="!allowCUD || !formEnabled.baseFormEnabled" v-model="arbitrationData.disputesName" label="纠纷人" placeholder="纠纷人" input-align="right" required :rules="[{ required: true }]"/>
-                <van-field required v-model="arbitrationData.disputesPhone" label="联系电话" placeholder="联系电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
+                <van-field :readonly="!allowCUD || !formEnabled.baseFormEnabled" v-model="arbitrationData.disputesPhone" label="联系电话" placeholder="联系电话" input-align="right" type="digit"/>
               </div>
               <div>
                 <p class="main_title"><span style="color: red;">*</span>纠纷事项</p>
@@ -227,7 +227,7 @@ export default {
         this.closeMoule(response.rows[0].zjddm);
       }
     });
-    this.getDetail();
+    this.getDetailgetDetail();
     this.getUserHouseApplyProposer();
   },
   computed: {
diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue
index 47d57e7e..d4656da5 100644
--- a/src/views/sunVillage_info/homeApplication/proposerLite.vue
+++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue
@@ -174,7 +174,7 @@
                     <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xzjdmj" label="宅基地面积" placeholder="宅基地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
                     <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xjzmj" label="建筑面积" placeholder="建筑面积㎡" input-align="right" type="number" :rules="[{ required: true }]" required ><template #right-icon>㎡</template></van-field>
 <!--                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingPerArea" label="人均建筑面积" placeholder="人均建筑面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>-->
-                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.qszsh" label="权属证证书号" placeholder="权属证证书号" input-align="right"/>
+                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.qszsh" label="权属证书号" placeholder="权属证证书号" input-align="right"/>
                     <field-select
                       v-model="applicationDetail.xzjdczqk"
                       label="处置情况"
@@ -2907,7 +2907,7 @@ export default {
           this.houseApplyUploadComp.proposerId = -1;
 
           this.pointDarw();
-          getWorkflow().then((resp) => {
+          getWorkflow(this.sysFarmer.deptId).then((resp) => {
 
             this.$set(this.applicationDetail, 'proposerActiveIndex', -1);
             this.$set(this.applicationDetail, 'startActiveIndex', -1);
@@ -2915,7 +2915,6 @@ export default {
             this.$set(this.applicationDetail, 'applyStepList', resp.data.applyStepList.name);
             this.$set(this.applicationDetail, 'startStepList', resp.data.startStepList.name);
             this.$set(this.applicationDetail, 'endStepList', resp.data.endStepList.name);
-            console.info(this.applicationDetail);
           });
           //this.initData();
           break;
diff --git a/打包.bat b/打包.bat
index 8f786c02..7cad4762 100644
--- a/打包.bat
+++ b/打包.bat
@@ -1,7 +1,7 @@
 @echo off
 
-D:
-cd D:\workspace\code\nsgk_mobile
+E:
+cd E:\nsgk_mobile
 
 
 
@@ -11,4 +11,4 @@ npm run build
 
 
 @echo SUCCESS
-pause
\ No newline at end of file
+pause