address-client 3.0.42-aodeToV4 → 3.0.44-aodeToV4

package/package.json

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

package/src/components/AddressList.vue

@@ -5,17 +5,8 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
 
           <div class="row">
-
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">组织机构</label>
-              <res-select
-                restype='organization'
-                @res-select="$parent.$parent.getorg"
-                is-mul="false"
-                :initresid='$parent.$parent.curorgid'
-              >
-              </res-select>
-            </div>
+            <new-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres"  :show-component="['company']"  @re-res="$parent.$parent.getRes">
+            </new-select-group>
             <div :class="$parent.$parent.style" v-if="$parent.$parent.showrightchange">
               <label class="font_normal_body">用户编号</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
@@ -98,11 +89,11 @@
             </div>
             <div :class="$parent.$parent.style" >
               <label class="font_normal_body">特殊地址</label>
-                <v-select :value.sync="model.f_special"
-                          v-model="model.f_special"
-                          :options='$parent.$parent.specialoptions' placeholder='请选择'
-                          condition=" {} "
-                          close-on-select></v-select>
+              <v-select :value.sync="model.f_special"
+                        v-model="model.f_special"
+                        :options='$parent.$parent.specialoptions' placeholder='请选择'
+                        condition=" {} "
+                        close-on-select></v-select>
             </div>
 
           </div>
@@ -169,72 +160,79 @@
 </template>
 
 <script>
-  import { PagedList } from 'vue-client'
+import { PagedList } from 'vue-client'
 
-  export default {
-    data () {
-      return {
-        iswork: false,
-        criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
-        addflag: false,
-        addtitle:'',
-        condition:'',
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        f_orgid: '',
-
-        //文件上传弹框
-        showFile: false,
-        showrightchange:true,
-        specialoptions:[{label:"全部",value:""},{label:"是",value:"a.f_special ='1'"},{label:"否",value:"a.f_special is null"}]
-      }
-    },
-    title: '地址列表',
-    props:{
-      f_filialeids:{
-        type: String
+export default {
+  data () {
+    return {
+      iswork: false,
+      criteriaShow: false,
+      model: new PagedList('api/af-revenue/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
+      addflag: false,
+      addtitle:'',
+      condition:'',
+      // 公司下拉
+      orgCondtionStr: '(' + this.$login.f.orgid + ')',
+      f_orgid: '',
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[],
       },
-      f_orgname:{
-        type: String
-      },
-      style: {
-        type: String,
-        default: 'col-sm-2 '
-      }
+      //文件上传弹框
+      showFile: false,
+      showrightchange:true,
+      specialoptions:[{label:"全部",value:""},{label:"是",value:"a.f_special ='1'"},{label:"否",value:"a.f_special is null"}]
+    }
+  },
+  title: '地址列表',
+  props:{
+    f_filialeids:{
+      type: String
     },
-    ready(){
-      this.search()
+    f_orgname:{
+      type: String
     },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      //添加方法
-      add(val){
-        if (this.f_filialeids) {
-          this.$refs.paged.$refs.grid.selectStore.selected = null
-          this.$dispatch('add',val)
-          this.showrightchange = false;
-        } else {
-          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        }
-      },
-      importAddress(){
-        this.showFile = true
-      },
-      // 关闭文件上传对话框
-      closeFile() {
-        this.showFile = false
-        // 将选的文件清空
-        this.$refs.file.$el.querySelector('input').value = ''
-      },
-      //修改
-      modify(val){
+    style: {
+      type: String,
+      default: 'col-sm-2 '
+    }
+  },
+  ready(){
+    this.search()
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes(obj) {
+      this.orgCondtionStr =obj
+    },
+    //添加方法
+    add(val){
+      if (this.f_filialeids) {
         this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      async delete(row){
+        this.$dispatch('add',val)
+        this.showrightchange = false;
+      } else {
+        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+      }
+    },
+    importAddress(){
+      this.showFile = true
+    },
+    // 关闭文件上传对话框
+    closeFile() {
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+    },
+    //修改
+    modify(val){
+      this.$refs.paged.$refs.grid.selectStore.selected = null
+      this.$dispatch('modify',val)
+    },
+    async delete(row){
 
       if(row.id){
         var id = row.id
@@ -242,7 +240,7 @@
         let isdelete = await this.$resetpost('api/af-revenue/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
         if(userfiles.data.length){
           this.$showAlert('该地址下已有正常/待开通表具档案,无法删除！','warning',1000)
-           return
+          return
         }
         if(isdelete.data.length){
           this.$showAlert('该地址下已有正在工作的置换单,无法删除！','warning',1000)
@@ -252,44 +250,39 @@
           this.$dispatch('cancel')
         })
       }
-  },
+    },
 
-  search () {
-    this.$refs.paged.$refs.cri.search()
-  },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
 
-  selfSearch (args) {
-        debugger
-    //去除空格
-    for(let key in args.model){
-      if(args.model[key] instanceof  String){
-        args.model[key] = args.model[key].trim();
+    selfSearch (args) {
+      //去除空格
+      for(let key in args.model){
+        if(args.model[key] instanceof  String){
+          args.model[key] = args.model[key].trim();
+        }
       }
-    }
-    if (!this.f_orgid) {
-      this.getorg([this.$login.f.orgid])
-    }
-    console.log("xxx"+this.f_filialeids)
-    args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
-    this.condition = args.condition
-    this.model.search(args.condition, args.model)
-  },
+      args.condition =  `${args.condition} and a.f_filialeid in ${this.orgCondtionStr}`
+      this.condition = args.condition
+      this.model.search(args.condition, args.model)
+    },
 
-  //清空
-  clear(){
-    this.$refs.paged.$refs.cri.model = {}
-  },
-  getorg (val, orgnames) {
-    if(orgnames.length>0){
-      this.f_orgname = orgnames[0].split(' - ')[0]
+    //清空
+    clear(){
+      this.$refs.paged.$refs.cri.model = {}
+    },
+    getorg (val, orgnames) {
+      if(orgnames.length>0){
+        this.f_orgname = orgnames[0].split(' - ')[0]
+      }
+      // this.f_orgid = this.$login.convertToIn(val)
+      // if (!this.f_orgid) {
+      //   this.f_orgid = this.f_filialeids
+      // }
+      this.f_orgid = val[0]
+      this.f_filialeids = val[0]
     }
-    // this.f_orgid = this.$login.convertToIn(val)
-    // if (!this.f_orgid) {
-    //   this.f_orgid = this.f_filialeids
-    // }
-    this.f_orgid = val[0]
-    this.f_filialeids = val[0]
-  }
   },
   computed:{
     getCondition() {
@@ -297,7 +290,7 @@
     },
     getfield() {
       let filed =[]
-       filed = {'f_userinfo_code': '用户编号','f_pcd': '区/县', 'f_slice_area': '片区/管理站', 'f_street': '街道名称','f_residential_area':'小区名称','f_building': '楼号','f_unit': '单元','f_floor':'楼层',
+      filed = {'f_userinfo_code': '用户编号','f_pcd': '区/县', 'f_slice_area': '片区/管理站', 'f_street': '街道名称','f_residential_area':'小区名称','f_building': '楼号','f_unit': '单元','f_floor':'楼层',
         'f_room': '门牌号','f_address': '详细地址','f_create_date': '时间'}
       return filed
     },
@@ -326,5 +319,5 @@
     }
   }
 
-  }
+}
 </script>

package/src/components/AddressManage.vue

@@ -41,14 +41,15 @@
         this.$refs.addresslist.showrightchange=false;
         this.style='col-sm-3 form-group'
         if(obj.val&&obj.val.id){
-          if (obj.val.f_filialeid != this.f_filialeids) {
-            this.refresh()
-            return
-          }
+          // if (obj.val.f_filialeid != this.f_filialeids) {
+          //   this.refresh()
+          //   return
+          // }
           // 呼叫中心需要
           this.$dispatch('re-ref', obj.val)
           this.addressId=obj.val.id
           this.useraddressShow=true
+          this.f_filialeids = obj.val.f_filialeid
           this.$refs.useraddressmsg.cleardara()
           this.$refs.useraddressmsg.initdata()
           this.$refs.useraddressmsg.usertype=obj.val.f_user_type

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) {

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

package/gradlew

@@ -1,249 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -1,92 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega