Merge branch 'feature/dev_party_mange' into master_shibei

src/views/modules/plugins/change/verify.vue

@@ -287,6 +287,8 @@
               >查看</el-button
             >
 
+
+            <template v-if="filterEdit(scope.row.agencyId)">
               <el-button
                 v-if="scope.row.confirmResult == '未审核'"
                 @click="handleEdit(scope.row)"
@@ -295,6 +297,7 @@
                 class="div-table-button--edit"
                 >审核</el-button
               >
+            </template>
             
           </template>
         </el-table-column>
@@ -447,6 +450,10 @@ export default {
     console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
   },
   methods: {
+    filterEdit (id) {
+      const { user } = this.$store.state
+      return id === user.agencyId
+    },
     handleClearVillage() {
       this.fmData.buildId = ''
       this.fmData.homeId = ''

src/views/modules/plugins/change/verifyForm.vue

@@ -34,7 +34,7 @@
             {{ detailInfo.villageName + detailInfo.buildName +  detailInfo.unitName + detailInfo.homeName }}
           </span>
         </el-form-item>
-        <el-divider></el-divider>
+        <!-- <el-divider></el-divider> -->
          <!-- <el-form-item
           label="迁出类型:"
           label-width="150px"
@@ -63,12 +63,12 @@
           >
             <span>{{ detailInfo.xxdz }}</span>
           </el-form-item> -->
-        <el-form-item
+        <!-- <el-form-item
           label="移除时间:"
           label-width="150px"
         >
           <span>{{ detailInfo.moveOutDate }}</span>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           label="移除原因:"
           label-width="150px"
@@ -85,7 +85,7 @@
             { required: true, message: '请选择审核结果', trigger: 'blur' },
           ]"
         >
-          <el-input v-if="btnType == 'detail' && confirmResult == ''" value="未审核"></el-input>
+          <el-input v-if="btnType == 'detail' && confirmResult == ''" value="未审核" style="width: 200px;"></el-input>
           <el-select
             v-else
               v-model.trim="confirmResult"
@@ -95,7 +95,7 @@
               class="item_width_1"
             >
               <el-option label="通过" value="1" />
-              <el-option label="未通过" value="2" />
+              <el-option label="驳回" value="2" />
             </el-select>
         </el-form-item>
         <el-form-item
@@ -104,10 +104,23 @@
         >
           <span style="color: red; font-size: 12px;">当前人员已不在该房屋</span>
         </el-form-item>
+        <el-form-item
+          v-if="confirmResult == 1"
+          label="同时迁至其他房屋:"
+          label-width="150px"
+        >
+          <el-radio-group v-model="isMoveOut">
+            <el-radio :label="1">需要</el-radio>
+            <el-radio :label="0">不需要</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item
           v-if="confirmResult == 2"
-          label="审核备注:"
+          label="驳回原因:"
           label-width="150px"
+          :rules="[
+            { required: true, message: '请填写驳回原因', trigger: 'blur' },
+          ]"
         >
           <el-input type="textarea" v-model="reason" style="width: 300px;"></el-input>
         </el-form-item>
@@ -126,9 +139,35 @@
           </el-form-item>
         </template> -->
       </el-form>
+      <el-form v-if="btnType == 'detail' && isMoveOut == 1" :model="detailInfo">
+        
+        <template>
+          <el-form-item
+            label="迁往区域:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newGridName }}</span>
+          </el-form-item>
+          <el-form-item
+            label="迁至房屋:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newHomeName }}</span>
+          </el-form-item>
+        </template>
+        
+        <el-form-item
+          label="迁出时间:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.moveOutDate }}</span>
+        </el-form-item>
+        
+      </el-form>
+
 
       <el-form
-        v-if="confirmResult == 1 && btnType == 'edit' && detailInfo.isInHome"
+        v-if="isMoveOut == 1 && btnType == 'edit' && detailInfo.isInHome"
         ref="ref_form"
         :inline="false"
         :model="dataForm"
@@ -160,7 +199,7 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
+        <!-- <el-form-item
           label="迁出类型:"
           prop="type"
           label-width="150px"
@@ -172,9 +211,9 @@
             }}</el-radio>
             <el-radio :label="'out'">其他</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
 
-        <div v-if="dataForm.type === 'in'">
+        <div v-if="isMoveOut == 1">
           <el-form-item label="迁出至" prop="agencyId" label-width="150px">
             <el-cascader
               ref="myCascader"
@@ -256,7 +295,7 @@
             </div>
           </el-form-item>
         </div>
-        <div v-if="dataForm.type === 'out'">
+        <!-- <div v-if="dataForm.type === 'out'">
           <el-form-item label="外迁详细地址:" prop="address" label-width="150px">
             <el-input
               type="textarea"
@@ -269,7 +308,7 @@
             >
             </el-input>
           </el-form-item>
-        </div>
+        </div> -->
         <el-form-item label="迁出原因:" prop="reason" label-width="150px">
           <el-input
             type="textarea"
@@ -339,6 +378,7 @@ export default {
       unitList: [],
       roomList: [],
       confirmResult: '',
+      isMoveOut: 0,
       reason: '',
       dataForm: {
         icUserId: '', // 被调动人ID
@@ -396,18 +436,18 @@ export default {
   computed: {
     dataRule() {
       return {
-        type: [
+        // type: [
-          { required: true, message: '操作类型不能为空', trigger: 'blur' }
+        //   { required: true, message: '操作类型不能为空', trigger: 'blur' }
-        ],
+        // ],
         agencyId: [
           { required: true, message: '所选组织不能为空', trigger: 'blur' }
         ],
         villageId: [
           { required: true, message: '所属家庭不能为空', trigger: 'blur' }
         ],
-        address: [
+        // address: [
-          { required: true, message: '外迁详细地址不能为空', trigger: 'blur' }
+        //   { required: true, message: '外迁详细地址不能为空', trigger: 'blur' }
-        ],
+        // ],
         outOfTime: [
           { required: true, message: '迁出时间不能为空', trigger: 'blur' }
         ]
@@ -416,6 +456,7 @@ export default {
   },
   methods: {
     async initForm(row) {
+      console.log('store----', this.$store.state)
       this.customerId = localStorage.getItem('customerId')
 
       // this.$refs.ref_form.resetFields()
@@ -449,10 +490,11 @@ export default {
       if (row.isInHome) {
         this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : ''
       } else this.confirmResult = '1'
+      if (row.newGridName) this.isMoveOut = 1
       
-      // this.reason = row.reason
+      this.reason = row.reason
 
-      await this.loadRootAgency()
+      // await this.loadRootAgency()
       await this.getAgencylist()
       setTimeout(() => {
         this.loadingForm = false
@@ -500,9 +542,9 @@ export default {
 
     async getAgencylist() {
       const url = '/gov/org/customeragency/rootagencygridtree'
-
+      const { agencyId } = this.$store.state.user
       const params = {
-        agencyId: this.rootAgency.id
+        agencyId: agencyId
       }
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
@@ -663,6 +705,10 @@ export default {
       setTimeout(() => {
         this.btnDisable = false
       }, 2000)
+      if (this.isMoveOut == 0) {
+        this.saveForm()
+        return
+      }
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
           // app.util.validateRule(messageObj)
@@ -690,6 +736,7 @@ export default {
       let params = {
         id: this.detailInfo.id,
         confirmResult: this.confirmResult,
+        isMoveOut: this.isMoveOut,
         reason: this.reason
       }
       if (this.confirmResult == 1 && this.detailInfo.isInHome) {
@@ -700,7 +747,8 @@ export default {
           buildName: this.dataForm.buildName,
           unitName: this.dataForm.unitName,
           homeName: this.dataForm.homeName,
-          xxdz: this.dataForm.address
+          xxdz: this.dataForm.address,
+          moveOutDate: this.dataForm.outOfTime
         }
       }
       
@@ -715,12 +763,15 @@ export default {
       }
     },
     async saveForm() {
-      const url = '/epmetuser/changeRelocation/moveOutHome'
+      const url = '/epmetuser/changeRelocation/moveOutHomeConfirm'
       let noData = new Date()
       noData = util.dateFormatter(noData, 'time')
       this.dataForm.transferTime = noData
-
+      const _data = {
-      const { data, code, msg } = await requestPost(url, this.dataForm)
+        ...this.dataForm,
+        isMoveOut: this.isMoveOut
+      }
+      const { data, code, msg } = await requestPost(url, _data)
 
       if (code === 0) {
         // this.$message.success('调动成功')