address-client 3.0.42-aodeToV4 → 3.0.43-aodeToV4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.0.42-aodeToV4",
+  "version": "3.0.43-aodeToV4",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/AreaList.vue

@@ -105,10 +105,17 @@
                </v-select>
              </div>
              <div :class="$parent.$parent.style">
-               <label class="font_normal_body">安检网格员电话</label>
-               <input  type="text" class="input_search" style="width:60%" v-model="model.f_check_phone"
-                       condition="f_check_phone like '%{}%'" placeholder="电话"
-                       :size="model.f_check_phone ? model.f_check_phone.length*2 : 6"/>
+               <label class="font_normal_body">上次安检网格员</label>
+               <v-select
+                 :value.sync="model.f_old_check_gridman"
+                 v-model="model.f_old_check_gridman"
+                 :options='$parent.$parent.gridmans'
+                 :value-single="true"
+                 placeholder='请选择'
+                 close-on-select
+                 condition="f_old_check_gridman = '{}'"
+                 :search='true'>
+               </v-select>
              </div>
              <div :class="$parent.$parent.style">
                <label class="font_normal_body">置换网格员</label>
@@ -124,10 +131,17 @@
                </v-select>
              </div>
              <div :class="$parent.$parent.style">
-               <label class="font_normal_body">置换网格员电话</label>
-               <input  type="text" class="input_search" style="width:60%" v-model="model.f_replace_phone"
-                       condition="f_replace_phone like '%{}%'" placeholder="电话"
-                       :size="model.f_replace_phone ? model.f_replace_phone.length*2 : 6"/>
+               <label class="font_normal_body">上次置换网格员</label>
+               <v-select
+                 :value.sync="model.f_old_replace_gridman"
+                 v-model="model.f_old_replace_gridman"
+                 :options='$parent.$parent.gridmans1'
+                 :value-single="true"
+                 placeholder='请选择'
+                 close-on-select
+                 condition="f_old_replace_gridman = '{}'"
+                 :search='true'>
+               </v-select>
              </div>
            </div>
            <div class="row" v-if="$parent.$parent.criteriaShow">
@@ -145,10 +159,17 @@
                </v-select>
              </div>
              <div :class="$parent.$parent.style">
-               <label class="font_normal_body">维修网格员电话</label>
-               <input  type="text" class="input_search" style="width:60%" v-model="model.f_repair_phone"
-                       condition="f_repair_phone like '%{}%'" placeholder="电话"
-                       :size="model.f_repair_phone ? model.f_repair_phone.length*2 : 6"/>
+               <label class="font_normal_body">上次维修网格员</label>
+               <v-select
+                 :value.sync="model.f_old_repair_gridman"
+                 v-model="model.f_old_repair_gridman"
+                 :options='$parent.$parent.gridmans2'
+                 :value-single="true"
+                 placeholder='请选择'
+                 close-on-select
+                 condition="f_old_repair_gridman = '{}'"
+                 :search='true'>
+               </v-select>
              </div>
              <div :class="$parent.$parent.style">
                <label class="font_normal_body">工商业网格员</label>
@@ -164,10 +185,17 @@
                </v-select>
              </div>
              <div :class="$parent.$parent.style">
-               <label class="font_normal_body">工商业网格员电话</label>
-               <input  type="text" class="input_search" style="width:60%" v-model="model.f_industry_phone"
-                       condition="f_industry_phone like '%{}%'" placeholder="电话"
-                       :size="model.f_industry_phone ? model.f_industry_phone.length*2 : 6"/>
+               <label class="font_normal_body">上次工商业网格员</label>
+               <v-select
+                 :value.sync="model.f_old_industry_gridman"
+                 v-model="model.f_old_industry_gridman"
+                 :options='$parent.$parent.gridmans3'
+                 :value-single="true"
+                 placeholder='请选择'
+                 close-on-select
+                 condition="f_old_industry_gridman = '{}'"
+                 :search='true'>
+               </v-select>
              </div>
            </div>
       </div>
@@ -221,12 +249,16 @@
             <th><nobr>操作人</nobr></th>
             <th><nobr>操作日期</nobr></th>
             <th><nobr>安检网格员</nobr></th>
+            <th><nobr>上次安检网格员</nobr></th>
             <th><nobr>安检网格员电话</nobr></th>
-            <th><nobr>维修网格员</nobr></th>
-            <th><nobr>维修网格员电话</nobr></th>
             <th><nobr>置换网格员</nobr></th>
+            <th><nobr>上次置换网格员</nobr></th>
             <th><nobr>置换网格员电话</nobr></th>
+            <th><nobr>维修网格员</nobr></th>
+            <th><nobr>上次维修网格员</nobr></th>
+            <th><nobr>维修网格员电话</nobr></th>
             <th><nobr>工商业网格员</nobr></th>
+            <th><nobr>上次工商业网格员</nobr></th>
             <th><nobr>工商业网格员电话</nobr></th>
             <th><nobr>操作</nobr></th>
 
@@ -270,12 +302,16 @@
             <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_gridman}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_old_check_gridman}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_phone}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_replace_gridman}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_old_replace_gridman}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_replace_phone}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_repair_gridman}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_old_repair_gridman}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_repair_phone}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_industry_gridman}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_old_industry_gridman}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_industry_phone}}</nobr></td>
             <td><nobr>
               <!--<button type="button" name="button" class="btn btn-link"
@@ -297,7 +333,7 @@
         </h4>
       </header>
       <article slot="modal-body" class="modal-body area-batch-gridman-body">
-        <p class="area-batch-hint">只填写需要修改的项，未选择的列保持原数据不变。</p>
+        <p class="area-batch-hint">只填写需要修改的项，未选择的列保持原数据不变。选错后可点第一项「不修改」恢复为不提交该列。</p>
         <table class="area-batch-gridman-table">
           <colgroup>
             <col class="area-batch-col-label-l">
@@ -309,7 +345,7 @@
               <span v-if="batchGridmanLoading" class="area-batch-loading">加载中…</span>
               <v-select v-else
                 :value.sync="batchData.f_check_gridman" :value-single="true"
-                :options='gridmans' placeholder='不修改请留空'
+                :options='batchGridmanOptions' placeholder='不修改请留空'
                 close-on-select @change="onBatchCheckChange">
               </v-select>
             </td>
@@ -320,7 +356,7 @@
               <span v-if="batchGridmanLoading" class="area-batch-loading">加载中…</span>
               <v-select v-else
                 :value.sync="batchData.f_replace_gridman" :value-single="true"
-                :options='gridmans1' placeholder='不修改请留空'
+                :options='batchGridmanOptions1' placeholder='不修改请留空'
                 close-on-select @change="onBatchReplaceChange">
               </v-select>
             </td>
@@ -331,7 +367,7 @@
               <span v-if="batchGridmanLoading" class="area-batch-loading">加载中…</span>
               <v-select v-else
                 :value.sync="batchData.f_repair_gridman" :value-single="true"
-                :options='gridmans2' placeholder='不修改请留空'
+                :options='batchGridmanOptions2' placeholder='不修改请留空'
                 close-on-select @change="onBatchRepairChange">
               </v-select>
             </td>
@@ -342,7 +378,7 @@
               <span v-if="batchGridmanLoading" class="area-batch-loading">加载中…</span>
               <v-select v-else
                 :value.sync="batchData.f_industry_gridman" :value-single="true"
-                :options='gridmans3' placeholder='不修改请留空'
+                :options='batchGridmanOptions3' placeholder='不修改请留空'
                 close-on-select @change="onBatchIndustryChange">
               </v-select>
             </td>
@@ -414,6 +450,28 @@
         }
         return this.batchCheckitem.length
       },
+      /** 批量弹窗专用：首项 value 为空，选后等同「本列不参与修改」，不影响表格行内编辑的 gridmans */
+      // 批量弹窗：去掉 gridmans 里的「全部」首项，只保留「不修改」选项
+      batchGridmanOptions () {
+        const none = { label: '— 不修改（保持原数据）—', value: '' }
+        const src = this.gridmans[0] && this.gridmans[0].value === '' ? this.gridmans.slice(1) : this.gridmans
+        return [none, ...src]
+      },
+      batchGridmanOptions1 () {
+        const none = { label: '— 不修改（保持原数据）—', value: '' }
+        const src = this.gridmans1[0] && this.gridmans1[0].value === '' ? this.gridmans1.slice(1) : this.gridmans1
+        return [none, ...src]
+      },
+      batchGridmanOptions2 () {
+        const none = { label: '— 不修改（保持原数据）—', value: '' }
+        const src = this.gridmans2[0] && this.gridmans2[0].value === '' ? this.gridmans2.slice(1) : this.gridmans2
+        return [none, ...src]
+      },
+      batchGridmanOptions3 () {
+        const none = { label: '— 不修改（保持原数据）—', value: '' }
+        const src = this.gridmans3[0] && this.gridmans3[0].value === '' ? this.gridmans3.slice(1) : this.gridmans3
+        return [none, ...src]
+      },
       getCondition() {
         return {condition: this.condition}
       },
@@ -686,15 +744,15 @@
               if (ph) this.batchGridmanPhoneMap3[nm] = ph
             }
           })
-          this.gridmans = arr
-          this.gridmans1 = arr1
-          this.gridmans2 = arr2
-          this.gridmans3 = arr3
+          this.gridmans = [{ label: '全部', value: '' }, ...arr]
+          this.gridmans1 = [{ label: '全部', value: '' }, ...arr1]
+          this.gridmans2 = [{ label: '全部', value: '' }, ...arr2]
+          this.gridmans3 = [{ label: '全部', value: '' }, ...arr3]
         } catch (e) {
-          this.gridmans = []
-          this.gridmans1 = []
-          this.gridmans2 = []
-          this.gridmans3 = []
+          this.gridmans = [{ label: '全部', value: '' }]
+          this.gridmans1 = [{ label: '全部', value: '' }]
+          this.gridmans2 = [{ label: '全部', value: '' }]
+          this.gridmans3 = [{ label: '全部', value: '' }]
           this.batchGridmanPhoneMap = {}
           this.batchGridmanPhoneMap1 = {}
           this.batchGridmanPhoneMap2 = {}
@@ -727,6 +785,64 @@
       onBatchReplaceChange (val) { this.onBatchGridmanChange('replace', val) },
       onBatchRepairChange (val) { this.onBatchGridmanChange('repair', val) },
       onBatchIndustryChange (val) { this.onBatchGridmanChange('industry', val) },
+      // 判断 rowId 是否在 ids 里（统一字符串比较，防止 11434 vs "11434" 不匹配）
+      idInList (ids, rowId) {
+        return ids.some(id => String(id) === String(rowId))
+      },
+      // 按 ids 顺序从行列表中取出对应行（id 可能为数字或字符串）
+      pickRowsByIds (rows, ids) {
+        if (!rows || !ids || ids.length === 0) return []
+        const m = {}
+        rows.forEach(r => {
+          if (r && r.id != null) m[String(r.id)] = r
+        })
+        return ids.map(id => m[String(id)]).filter(Boolean)
+      },
+      // 批量修改前：拉取选中行的原始行（含 f_check_gridman 等）。列表接口分页，不能只用 pageSize=ids.length（会拿到前 N 条而非选中 id）
+      async collectOldGridmanRows (ids) {
+        if (!ids || ids.length === 0) return []
+        let got = this.model && this.model.rows ? this.pickRowsByIds(this.model.rows, ids) : []
+        if (got.length === ids.length) return got
+        try {
+          let http = new HttpResetClass()
+          const opt = { resolveMsg: null, rejectMsg: null, aoteEncrypt: this.model.aoteEncrypt, encryKey: this.model.encryKey }
+          const n = Math.max((this.model && this.model.count) || 0, ids.length, 50)
+          const url = `${this.model.url}?pageNo=1&pageSize=${n}`
+          const res = await http.load('POST', url, { data: this.model.params }, opt)
+          let list = res && res.data
+          if (list && !Array.isArray(list) && list.rows) list = list.rows
+          if (!Array.isArray(list)) return got
+          const full = this.pickRowsByIds(list, ids)
+          return full.length >= got.length ? full : got
+        } catch (e) {
+          return got
+        }
+      },
+      // 把「改前网格员」写入 setClause（只写 changedTypes 里的列）
+      appendBatchOldGridmanParts (setClause, rows, changedTypes) {
+        if (!changedTypes || changedTypes.length === 0) return
+        const typeToPair = {
+          check:   ['f_old_check_gridman',     'f_check_gridman'],
+          replace: ['f_old_replace_gridman',   'f_replace_gridman'],
+          repair:  ['f_old_repair_gridman',    'f_repair_gridman'],
+          industry:['f_old_industry_gridman',  'f_industry_gridman']
+        }
+        const valOf = (row, src) => (row[src] != null && row[src] !== '' ? String(row[src]) : '')
+        if (!rows || rows.length === 0) return
+        changedTypes.forEach(type => {
+          const pair = typeToPair[type]
+          if (!pair) return
+          const [oldCol, srcCol] = pair
+          if (rows.length === 1) {
+            setClause.push(oldCol + " = '" + this.escapeSql(valOf(rows[0], srcCol)) + "'")
+          } else {
+            const first = valOf(rows[0], srcCol)
+            if (rows.every(r => valOf(r, srcCol) === first)) {
+              setClause.push(oldCol + " = '" + this.escapeSql(first) + "'")
+            }
+          }
+        })
+      },
       // 从 v-select 取值（可能为字符串、数组、对象）
       normBatchGridmanVal (v) {
         if (v === null || v === undefined) return null
@@ -750,38 +866,44 @@
         return t === '' ? null : t
       },
       // 确认批量修改：只提交已选择的网格员字段及对应电话（前端拼接 setClause）
-      confirmBatchModify() {
+      async confirmBatchModify() {
         const c = this.normBatchGridmanVal(this.batchData.f_check_gridman)
         const r = this.normBatchGridmanVal(this.batchData.f_replace_gridman)
         const rp = this.normBatchGridmanVal(this.batchData.f_repair_gridman)
         const ind = this.normBatchGridmanVal(this.batchData.f_industry_gridman)
         const parts = []
         const labels = []
+        // changedTypes 标记实际修改了哪几列，只对这些列写入 f_old_*
+        const changedTypes = []
         if (c != null) {
           parts.push("f_check_gridman = '" + this.escapeSql(c) + "'")
           parts.push("f_check_phone = '" + this.escapeSql(this.batchData.f_check_phone || '') + "'")
           labels.push('安检网格员')
+          changedTypes.push('check')
         }
         if (r != null) {
           parts.push("f_replace_gridman = '" + this.escapeSql(r) + "'")
           parts.push("f_replace_phone = '" + this.escapeSql(this.batchData.f_replace_phone || '') + "'")
           labels.push('置换网格员')
+          changedTypes.push('replace')
         }
         if (rp != null) {
           parts.push("f_repair_gridman = '" + this.escapeSql(rp) + "'")
           parts.push("f_repair_phone = '" + this.escapeSql(this.batchData.f_repair_phone || '') + "'")
           labels.push('维修网格员')
+          changedTypes.push('repair')
         }
         if (ind != null) {
           parts.push("f_industry_gridman = '" + this.escapeSql(ind) + "'")
           parts.push("f_industry_phone = '" + this.escapeSql(this.batchData.f_industry_phone || '') + "'")
           labels.push('工商业网格员')
+          changedTypes.push('industry')
         }
         if (parts.length === 0) {
           this.$showAlert('请至少选择一项要修改的网格员', 'warning', 2000)
           return
         }
-        const setClause = parts.join(',')
+        const setClause = parts
 
         // 全选模式：先请求全量 id，再弹确认
         if (this.batchSelectAll) {
@@ -789,13 +911,13 @@
             this.$showAlert('查询数据已失效，请重新查询后再试', 'warning', 2000)
             return
           }
-          this._doBatchSubmit(setClause, labels, this.model.count, true)
+          this._doBatchSubmit(setClause, labels, this.model.count, true, changedTypes)
         } else {
           if (this.batchCheckitem.length === 0) {
             this.$showAlert('请先选择要修改的小区', 'warning', 2000)
             return
           }
-          this._doBatchSubmit(setClause, labels, this.batchCheckitem.length, false)
+          this._doBatchSubmit(setClause, labels, this.batchCheckitem.length, false, changedTypes)
         }
       },
       // SQL 字符串转义，防止注入
@@ -804,47 +926,56 @@
         return String(val).replace(/'/g, "''")
       },
       // 统一提交逻辑
-      _doBatchSubmit(setClause, labels, count, fromAllSelect) {
-        const payload = { ids: null, setClause: setClause }
+      // setClause: string[]  待更新的字段 parts，函数内部追加 f_old_* 字段后再 join
+      // fromAllSelect: bool  是否全选模式（需要自行拉 id + 旧数据）
+      // changedTypes: string[]  实际修改了哪些列（如 ['check']），只对这些列写入 f_old_*
+      async _doBatchSubmit(setClause, labels, count, fromAllSelect, changedTypes) {
+        const payload = { ids: null, setClause: '' }
         const msg = `共计修改${count}个小区，将更新：${labels.join('、')}，请确认`
-        this.$showMessage(msg, ['confirm', 'cancel']).then(async (res) => {
-          if (res === 'confirm') {
-            this.batchSubmitBusy = true
+        const confirmed = await this.$showMessage(msg, ['confirm', 'cancel'])
+        if (confirmed !== 'confirm') return
+        this.batchSubmitBusy = true
+        try {
+          if (fromAllSelect) {
+            if (!this.model || this.model.state !== '正确' || !this.model.count) {
+              this.$showAlert('查询数据已失效，请重新查询后再试', 'warning', 2000)
+              return
+            }
             try {
-              if (fromAllSelect) {
-                // 全选：发请求拉全量 id 用于提交
-                try {
-                  let http = new HttpResetClass()
-                  const opt = { resolveMsg: null, rejectMsg: null, aoteEncrypt: this.model.aoteEncrypt, encryKey: this.model.encryKey }
-                  const url = `${this.model.url}?pageNo=1&pageSize=${this.model.count}`
-                  const res2 = await http.load('POST', url, { data: this.model.params }, opt)
-                  let list = res2 && res2.data
-                  if (list && !Array.isArray(list) && list.rows) list = list.rows
-                  if (Array.isArray(list) && list.length > 0) {
-                    payload.ids = list.map(r => r.id).filter(id => id != null && id !== '')
-                  }
-                } catch (e) { /* ignore */ }
-                if (!payload.ids || payload.ids.length === 0) {
-                  this.$showAlert('全选数据获取失败，无法提交', 'warning', 2000)
-                  return
-                }
-              } else {
-                payload.ids = this.batchCheckitem
+              let http = new HttpResetClass()
+              const opt = { resolveMsg: null, rejectMsg: null, aoteEncrypt: this.model.aoteEncrypt, encryKey: this.model.encryKey }
+              const url = `${this.model.url}?pageNo=1&pageSize=${this.model.count}`
+              const res2 = await http.load('POST', url, { data: this.model.params }, opt)
+              let list = res2 && res2.data
+              if (list && !Array.isArray(list) && list.rows) list = list.rows
+              if (Array.isArray(list) && list.length > 0) {
+                payload.ids = list.map(r => r.id).filter(id => id != null && id !== '')
+                const targetRows = list.filter(r => this.idInList(payload.ids, r.id))
+                this.appendBatchOldGridmanParts(setClause, targetRows, changedTypes)
               }
-              await this.$resetpost('api/af-revenue/logic/batchUpdateGridman', payload, {
-                resolveMsg: '批量修改成功',
-                rejectMsg: '批量修改失败'
-              })
-              this.batchModifyShow = false
-              this.batchCheckitem = []
-              this.batchCheckall = false
-              this.batchSelectAll = false
-              this.search()
-            } finally {
-              this.batchSubmitBusy = false
+            } catch (e) { /* ignore */ }
+            if (!payload.ids || payload.ids.length === 0) {
+              this.$showAlert('全选数据获取失败，无法提交', 'warning', 2000)
+              return
             }
+          } else {
+            payload.ids = this.batchCheckitem
+            const targetRows = await this.collectOldGridmanRows(this.batchCheckitem)
+            this.appendBatchOldGridmanParts(setClause, targetRows, changedTypes)
           }
-        })
+          payload.setClause = setClause.join(',')
+          await this.$resetpost('api/af-revenue/logic/batchUpdateGridman', payload, {
+            resolveMsg: '批量修改成功',
+            rejectMsg: '批量修改失败'
+          })
+          this.batchModifyShow = false
+          this.batchCheckitem = []
+          this.batchCheckall = false
+          this.batchSelectAll = false
+          this.search()
+        } finally {
+          this.batchSubmitBusy = false
+        }
       },
       add(val){
         if (this.f_filialeids) {