apply-clients 3.1.48 → 3.1.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.1.48",
+  "version": "3.1.51",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -56,6 +56,7 @@
                 :value.sync="model.f_residential_area"
                 :options='$parent.$parent.area'
                 class="select select_list"
+                search="true"
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
@@ -131,7 +132,7 @@
                           :value.sync="model.f_charge_date"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="true"
-                          condition="c.f_charge_date <= '{} 23:59:59' and c.f_charge_date >= '{} 00:00:00'">
+                          condition="ch.f_charge_date <= '{} 23:59:59' and ch.f_charge_date >= '{} 00:00:00'">
               </datepicker>
             </div>
           </div>

package/src/components/product/Function/InstallInfoSelect.vue

@@ -55,6 +55,7 @@
                 :value.sync="model.f_residential_area"
                 :options='$parent.$parent.area'
                 class="select select_list"
+                search="true"
                 :value-single="true"
                 close-on-select ></v-select>
             </div>

package/src/components/product/Function/functions/ChargeManagement.vue

@@ -60,6 +60,13 @@
                   :disabled="$parent.$parent.mark === 1 || row.f_charge_state === '作废'"
                   @click="$parent.$parent.showInvalidModal(row)"
                 >作废</button>
+                <button
+                  type="button"
+                  name="button"
+                  class="btn btn-link"
+                  :disabled="$parent.$parent.mark === 1 || row.f_charge_state === '作废'"
+                  @click="$parent.$parent.updateChargeModal(row)"
+                >修改</button>
               </nobr>
             </td>
           </tr>
@@ -74,10 +81,10 @@
       <article slot="modal-body" class="modal-body clearfix">
         <div v-if="data.f_apply_type === '散户报建'" class="form-group col-sm-12 panel panel-info">
           <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
-            <div class="col-sm-6 text-left">设备信息</div>
+            <div class="col-sm-6 text-left">增值产品信息</div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备品牌：</label>
+            <label class="col-sm-4 control-label">增值产品品牌：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -89,7 +96,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备类型：</label>
+            <label class="col-sm-4 control-label">增值产品类型：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -101,7 +108,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备数量：</label>
+            <label class="col-sm-4 control-label">增值产品数量：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
                      placeholder="设备数量"
@@ -159,7 +166,7 @@
             <div class="col-sm-6 text-left">设备信息</div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备品牌：</label>
+            <label class="col-sm-4 control-label">增值产品品牌：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -171,7 +178,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备类型：</label>
+            <label class="col-sm-4 control-label">增值产品类型：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -183,7 +190,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备数量：</label>
+            <label class="col-sm-4 control-label">增值产品数量：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
                      placeholder="设备数量"
@@ -242,7 +249,7 @@
               close-on-select ></input-select>
           </div>
         </div>
-        <div class="form-group col-sm-12" :class="charge.f_ticket_number ? '':'has-error'">
+        <div class="form-group col-sm-12">
           <label class="col-sm-2 control-label">票号：</label>
           <div class="col-sm-10">
             <input type="text"
@@ -319,7 +326,8 @@
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="saveCharge()">新增收费</button>
+        <button type="button" v-if="!showupdateCharge" class="btn btn-primary" @click="saveCharge()">新增收费</button>
+        <button type="button" v-if="showupdateCharge" class="btn btn-primary" @click="updateCharge()">确认修改</button>
       </footer>
     </modal>
     <modal v-if="showInvalid" :show.sync="showInvalid" v-ref:modal :large="true" :backdrop="false" title="作废收费">
@@ -330,10 +338,10 @@
       <article slot="modal-body" class="modal-body clearfix">
         <div v-for="(i, item) in model.userfile.devicesinfo" v-if="data.f_apply_type === '散户报建'" class="form-group col-sm-12 panel panel-info">
           <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
-            <div class="col-sm-6 text-left">设备信息</div>
+            <div class="col-sm-6 text-left">增值产品信息</div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备品牌：</label>
+            <label class="col-sm-4 control-label">增值产品品牌：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -345,7 +353,7 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备类型：</label>
+            <label class="col-sm-4 control-label">增值产品类型：</label>
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
@@ -357,10 +365,10 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备数量：</label>
+            <label class="col-sm-4 control-label">增值产品数量：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
-                     placeholder="设备数量"
+                     placeholder="增值产品数量"
                      v-model="item.f_devices_num"
                      :value="item.f_devices_num"
                      readonly/>
@@ -512,7 +520,8 @@ export default {
       userfile: {
         devicesinfo: null
       },
-      personList: []
+      personList: [],
+      showupdateCharge: false
     }
   },
   ready () {
@@ -566,6 +575,49 @@ export default {
       e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
       this.charge.f_amount_words = this.smalltoBIG(e.target.value)
     },
+    async updateChargeModal(row) {
+
+      this.charge = row
+      if (this.data.f_apply_type === '散户报建'){
+        await this.openDevicesModal(row)
+      }
+
+      this.showupdateCharge = true
+      this.showCharge = true
+    },
+    async updateCharge() {
+      if(this.data.f_apply_type === '散户报建'){
+        for (let i = 0; i < this.data.fields.length; i++) {
+          if (this.data.fields[i].label === '应交金额') {
+            this.data.f_due_money = this.data.fields[i].value
+          }
+          if (this.data.fields[i].label === '合同价格') {
+            this.data.f_contract_money = this.data.fields[i].value
+            console.log("合同金额",this.data.f_contract_money)
+          }
+        }
+      }
+      let data = {
+        charge: this.charge,
+        selectdata: this.data
+      }
+      console.log()
+      if (this.data.f_apply_type === '散户报建' && this.userfile.devicesinfo !== null){
+
+        data.userfile = this.userfile
+        data.user = this.$login.f
+        data.userfile.devicesinfo.f_ticket_number = this.charge.f_ticket_number
+      }
+      let res = await this.$resetpost(
+        `rs/logic/updateCharge`,
+        data
+      )
+      this.showCharge = false
+      this.showupdateCharge = false
+      this.charge = {}
+
+      this.$dispatch('breakControl', res.data)
+    },
     async saveCharge() {
       this.apply_data()
       // if (isEmpty(this.charge.f_useraddress_id) && this.selectdata.f_apply_type !== '开发商集体报建') {
@@ -619,15 +671,13 @@ export default {
         data.userfile.devicesinfo.f_ticket_number = this.charge.f_ticket_number
       }
       console.log("开始收费：" + JSON.stringify(data))
-      try {
-        let res = await http.load('POST', 'rs/logic/addCharge', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: null
-        })
-        this.update_data()
-      } catch (e) {
-        this.$showAlert(e.data, 'danger', 3000)
-      }
+      let res
+
+      res = await http.load('POST', 'rs/logic/addCharge', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+
       if (this.data.f_apply_type === '散户报建' && this.userfile.devicesinfo){
         // this.addDevice()
       }
@@ -638,7 +688,7 @@ export default {
       this.charge.f_charge_remarks = ''
       this.charge.f_charge_date = ''
       this.charge.f_ticket_number = ''
-      this.search()
+      this.$dispatch('breakControl', res.data)
     },
     // 金额转大写
     smalltoBIG(n) {
@@ -727,6 +777,14 @@ export default {
     },
     async apply_data () {
       for (let i = 0; i < this.data.fields.length; i++) {
+        if(this.data.f_apply_type === '散户报建') {
+          if (this.data.fields[i].label === '合同价格') {
+            this.data.f_contract_money = this.data.fields[i].value
+          }
+          if (this.data.fields[i].label === '应交金额') {
+            this.data.f_due_money = this.data.fields[i].value
+          }
+        }
         if (this.data.fields[i].label == '应交金额') {
           this.applydata.f_due_money = this.data.fields[i].value
           console.log("应交金额:" + this.data.fields[i].value)
@@ -753,12 +811,12 @@ export default {
     async update_data () {
       for (let i = 0; i < this.data.fields.length; i++) {
         if (this.data.fields[i].label == '累计缴费金额') {
-          this.data.fields[i].value = Number(this.applydata.f_cumulative_money) + Number(this.charge.f_charge_money)
-          this.data.f_cumulative_money = Number(this.applydata.f_cumulative_money) + Number(this.charge.f_charge_money)
+          this.data.fields[i].value = Number(this.data.f_cumulative_money) + Number(this.charge.f_charge_money)
+          this.data.f_cumulative_money = Number(this.data.f_cumulative_money) + Number(this.charge.f_charge_money)
         }
         if (this.data.fields[i].label == '欠费金额') {
-          this.data.fields[i].value = Number(this.applydata.f_arrears_money) - Number(this.charge.f_charge_money)
-          this.data.f_arrears_money = Number(this.applydata.f_arrears_money) - Number(this.charge.f_charge_money)
+          this.data.fields[i].value = Number(this.data.f_arrears_money) - Number(this.charge.f_charge_money)
+          this.data.f_arrears_money = Number(this.data.f_arrears_money) - Number(this.charge.f_charge_money)
         }
       }
       if (this.data.f_apply_type === '散户报建'){
@@ -780,16 +838,18 @@ export default {
       for (let i = 0; i < this.data.fields.length; i++) {
         if (this.data.fields[i].label == '累计缴费金额') {
           this.data.fields[i].value = Number(this.data.f_cumulative_money) - Number(row.f_charge_money)
+          this.data.f_cumulative_money = this.data.fields[i].value
         }
         if (this.data.fields[i].label == '欠费金额') {
           this.data.fields[i].value = Number(this.data.f_arrears_money) + Number(row.f_charge_money)
+          this.data.f_arrears_money = this.data.fields[i].value
         }
       }
     },
     async openDevicesModal (row) {
       let data = {
         tablename: 't_devices',
-        condition: `f_process_id = '${this.data.f_process_id}' and f_ticket_number = '${row.f_ticket_number}' and f_devices_state = '有效'`
+        condition: `f_process_id = '${this.data.f_process_id}' and f_charge_id = '${row.id}' and f_devices_state = '有效'`
       }
       let res = await this.$resetpost(
         `rs/sql/singleTable`,
@@ -797,8 +857,12 @@ export default {
         {resolveMsg: null, rejectMsg: '设备查询失败！！！'}
       )
 
-      Vue.set(this.model.userfile, 'devicesinfo', res.data)
-      console.log("设备信息",this.model.userfile.devicesinfo)
+      if (res.data.length > 0){
+        Vue.set(this.model.userfile, 'devicesinfo', res.data)
+        Vue.set(this.userfile, 'devicesinfo', res.data[0])
+        console.log("设备信息",this.model.userfile.devicesinfo)
+        console.log("设备信息",this.userfile.devicesinfo)
+      }
     },
     async addDevice () {
       let data = {
@@ -830,10 +894,12 @@ export default {
     closeModal() {
       this.showCharge = false
       this.showInvalid = false
+      this.showupdateCharge = false
       if (this.data.f_apply_type === '散户报建') {
         this.model.userfile = null
       }
       this.charge = {}
+      this.userfile.devicesinfo = null
       this.chargeUseraddress = null
       this.search()
     },

package/src/components/product/Process/ExplorationSelect.vue

@@ -50,6 +50,7 @@
                   :value.sync="model.f_residential_area"
                   :options='$parent.$parent.area'
                   class="select select_list"
+                  search="true"
                   :value-single="true"
                   close-on-select ></v-select>
               </div>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -524,6 +524,52 @@
           }
         }
       },
+      getTotalCost(){
+        if (this.selectdata.defname === '结算') {
+          for (let i = 0; i < this.show_data.fields.length; i++) {
+            if (this.show_data.fields[i].label === '低压工程款') {
+              this.show_data.f_project_money_down = Number(this.show_data.fields[i].value)
+              console.log("测试1", this.show_data.f_project_money_down)
+            } else if (this.show_data.fields[i].label === '中压工程款') {
+              this.show_data.f_project_money_up = Number(this.show_data.fields[i].value)
+              console.log("测试2", this.show_data.f_project_money_up)
+            } else if (this.show_data.fields[i].label === '低压材料款') {
+              this.show_data.f_material_money_down = Number(this.show_data.fields[i].value)
+              console.log("测试3", this.show_data.f_material_money_down)
+            } else if (this.show_data.fields[i].label === '中压材料款') {
+              this.show_data.f_material_money_up = Number(this.show_data.fields[i].value)
+              console.log("测试4", this.show_data.f_material_money_up)
+            } else if (this.show_data.fields[i].label === '支付结算') {
+              console.log("测试5", this.show_data.f_payment_settlement)
+              if ((this.show_data.f_project_money_down + this.show_data.f_project_money_up) > 0) {
+                this.show_data.fields[i].value = this.show_data.f_project_money_down + this.show_data.f_project_money_up
+              }
+              this.show_data.f_payment_settlement = Number(this.show_data.fields[i].value)
+            } else if (this.show_data.fields[i].label === '支付材料') {
+              console.log("测试6", (this.show_data.f_material_money_down + this.show_data.f_material_money_up))
+              if ((this.show_data.f_material_money_down + this.show_data.f_material_money_up) > 0) {
+                console.log("测试6", (this.show_data.f_material_money_down + this.show_data.f_material_money_up))
+                this.show_data.fields[i].value = this.show_data.f_material_money_down + this.show_data.f_material_money_up
+              }
+              this.show_data.f_payment_material = Number(this.show_data.fields[i].value)
+            } else if (this.show_data.fields[i].label === '总成本') {
+              if ((this.show_data.f_payment_material + this.show_data.f_payment_settlement) > 0) {
+                console.log("测试7")
+                this.show_data.fields[i].value = this.show_data.f_payment_material + this.show_data.f_payment_settlement
+              }
+              this.show_data.f_total_cost = this.show_data.fields[i].value
+            } else if (this.show_data.fields[i].label === '毛利') {
+              if (this.show_data.f_total_cost > 0) {
+                console.log("测试8")
+                let number = parseFloat((this.selectdata.f_contract_money - this.show_data.f_total_cost) / this.selectdata.f_contract_money).toFixed(5)
+                let realVal = number.substring(0, number.length - 1)
+                this.show_data.fields[i].value =(realVal * 100).toFixed(2)+"%"
+              }
+            }
+          }
+          console.log("测试", this.show_data)
+        }
+      },
       an_kang_yi_hua () {
         //===================安康逸华前端特殊逻辑===========================
         let swap1 = null  // 小区名称转换
@@ -896,6 +942,7 @@
         this.an_kang_yi_hua()
         this.getGasMeter1()
         this.getGasPrice()
+        this.getTotalCost()
 
 
         // 合成地址

package/src/components/product/Report/ApplyDevicesList.vue

@@ -110,7 +110,7 @@
             <nobr><font>{{ $index+1 }}</font></nobr>
           </td>
           <td style="text-align: center;">
-            <nobr><font>{{ row.f_operation_date }}</font></nobr>
+            <nobr><font>{{ row.f_charge_date }}</font></nobr>
           </td>
           <td style="text-align: center;">
             <nobr><font>{{ row.f_user_name }}</font></nobr>
@@ -188,7 +188,7 @@ export default {
         sum: 0
       },
       getfield: {
-        'f_operation_date': '     收 费 时 间     ',
+        'f_charge_date': '     收 费 时 间     ',
         'f_user_name': '  姓  名  ',
         'f_phone': '    电  话    ',
         'f_residential_area': '  小 区 名 称   ',

package/src/components/product/ReportForm/CustomerRecordMessage.vue

@@ -1488,27 +1488,26 @@
             //   }
             // })
             let http = new HttpResetClass()
-            await http.load('POST', 'rs/logic/recordImport', data, {
+          let w = await http.load('POST', 'rs/logic/recordImport', data, {
               resolveMsg: null,
               rejectMsg: '导入失败'
-            }).then((res) => {
-              if(res.data){
-                this.iswork=false;
+            })
+              if(w.data) {
+                this.iswork = false;
                 this.load();
                 this.closeFile();
                 let mm = '';
-                for(var i=0;i<res.data.msg.length;i++){
-                  mm+= `${res.data.msg[i].msg}`
+                for (var i = 0; i < w.data.msg.length; i++) {
+                  mm += `${w.data.msg[i].msg}`
                 }
-                let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
-                if (res.data.code == 500) {
-                  this.iswork=false;
-                  msg = res.data.msg
+                let msg = `共导入${w.data.alllength}条,失败${w.data.errorlen}条,失败信息:${mm}`
+                if (w.data.code === 500) {
+                  this.iswork = false;
+                  msg = w.data.msg
                 }
                 console.log("返回的数据：" + JSON.stringify(res.data))
                 this.$showMessage(msg)
               }
-            })
           // }catch(e){
           //
           //   this.$showAlert('导入出错,请检查导入文件模板格式!','danger',2000);
@@ -1533,27 +1532,26 @@
           };
           console.log('即将转发的数据',data);
           let http = new HttpResetClass()
-          await http.load('POST', 'rs/logic/incrementImport', data, {
+          let result = await http.load('POST', 'rs/logic/incrementImport', data, {
             resolveMsg: null,
             rejectMsg: '导入失败'
-          }).then((res) => {
-            if(res.data){
+          })
+            if(result.data){
               this.iswork=false;
               this.load();
               this.closeFile();
               let mm = '';
-              for(var i=0;i<res.data.msg.length;i++){
-                mm+= `${res.data.msg[i].msg}`
+              for(var i=0;i<result.data.msg.length;i++){
+                mm+= `${result.data.msg[i].msg}`
               }
-              let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
-              if (res.data.code == 500) {
+              let msg = `共导入${result.data.alllength}条,失败${result.data.errorlen}条,失败信息:${mm}`
+              if (result.data.code == 500) {
                 this.iswork=false;
-                msg = res.data.msg
+                msg = result.data.msg
               }
-              console.log("返回的数据：" + JSON.stringify(res.data))
+              console.log("返回的数据：" + JSON.stringify(result.data))
               this.$showMessage(msg)
             }
-          })
           // try{
           //   await axios.post('rs/logic/incrementImport',
           //     data).then((res)=>{

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -55,6 +55,7 @@
                 condition="u.f_residential_area = '{}'"
                 :value.sync="model.f_residential_area"
                 :options='$parent.$parent.area'
+                search="true"
                 class="select select_list"
                 :value-single="true"
                 close-on-select ></v-select>

package/src/components/product/Supervisory/SupervisoryList2.vue

@@ -55,6 +55,7 @@
                 :value.sync="model.f_residential_area"
                 :options='$parent.$parent.area'
                 class="select select_list"
+                search="true"
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
@@ -199,9 +200,12 @@
     data() {
       return {
         applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
-        model: {
-          data:null
-        },
+        model: new PagedList('rs/sql/supervisory2', 20, {
+            data: {
+              id: `${this.$login.f.id}`,
+              org: `${this.$login.f.orgs}`
+            }
+          }),
         defnames:[], // 所有流程节点
         condition: '', // 查询条件
         criteriaShow: false,
@@ -237,58 +241,59 @@
       },
       //获取当前登录人已处理过的流程ID
       async searchCondition() {
-        let http = new HttpResetClass()
-        let data = {
-          org: `${this.$login.f.orgs}`
-        }
-        let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: '查询角色失败'
-        })
-        let x = []
-        for (let i = 0; i < res.data.length; i++) {
-          if (this.$login.f.f_role_name.includes(res.data[i].actor)) {
-            x.push(res.data[i].processid)
-          }
-        }
-        this.processids = JSON.stringify(x)
-
-        console.log("x的数据", this.processids)
+        // let http = new HttpResetClass()
+        // let data = {
+        //   org: `${this.$login.f.orgs}`
+        // }
+        // let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
+        //   resolveMsg: null,
+        //   rejectMsg: '查询角色失败'
+        // })
+        // let x = []
+        // for (let i = 0; i < res.data.length; i++) {
+        //   if (this.$login.f.f_role_name.includes(res.data[i].actor)) {
+        //     x.push(res.data[i].processid)
+        //   }
+        // }
+        // this.processids = JSON.stringify(x)
+        //
+        // console.log("x的数据", this.processids)
       },
       async search() {
-        let http = new HttpResetClass()
-        let data = {
-          org: `${this.$login.f.orgs}`
-        }
-        let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: '查询角色失败'
-        })
-        let x = []
-        for (let i = 0; i < res.data.length; i++){
-          if (this.$login.f.f_role_name.includes(res.data[i].actor)){
-            x.push(res.data[i].processid)
-          }
-        }
-        this.processids = JSON.stringify(x)
-        console.log("x的数据",this.processids)
-         data = {
-          condition: '1=1',
-          x:this.processids,
-          org: `${this.$login.f.orgs}`
-        }
-        if (this.$refs.cp.$refs.cri.condition){
-          data.condition = data.condition + 'and' +this.$refs.cp.$refs.cri.condition
-        }
-        this.condition = data.condition
-         res = await http.load('POST', 'rs/sql/supervisory2', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: '查询失败'
-        })
-        console.log("当前数据",res.data)
-        this.model.data = res.data
+        console.log("测试1",this.$login.f.id)
+        // let http = new HttpResetClass()
+        // let data = {
+        //   org: `${this.$login.f.orgs}`
+        // }
+        // let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
+        //   resolveMsg: null,
+        //   rejectMsg: '查询角色失败'
+        // })
+        // let x = []
+        // for (let i = 0; i <= res.data.length; i++){
+        //   if (this.$login.f.f_role_name.includes(res.data[i].actor)){
+        //     x.push(res.data[i].processid)
+        //   }
+        // }
+        // this.processids = JSON.stringify(x)
+        // console.log("x的数据",this.processids)
+        //  data = {
+        //   condition: '1=1',
+        //   x:this.processids,
+        //   org: `${this.$login.f.orgs}`
+        // }
+        // if (this.$refs.cp.$refs.cri.condition){
+        //   data.condition = data.condition + 'and' +this.$refs.cp.$refs.cri.condition
+        // }
+        // this.condition = data.condition
+        //  res = await http.load('POST', 'rs/sql/supervisory2', {data: data}, {
+        //   resolveMsg: null,
+        //   rejectMsg: '查询失败'
+        // })
+        // console.log("当前数据",res.data)
+        // this.model.data = res.data
         // 调用查询
-        // this.$refs.cp.$refs.cri.search()
+        this.$refs.cp.$refs.cri.search()
       },
       hidden() {
         this.$dispatch('hidden', this.criteriaShow)
@@ -331,12 +336,12 @@
       getCondition () {
         console.log("condition",this.$refs.cp.$refs.cri.condition)
         return {
-          condition: this.condition,
-          org: `${this.$login.f.orgs}`,
-          x: this.processids,
+          condition: this.$refs.cp.$refs.cri.condition,
+          // org: `${this.$login.f.orgs}`,
+          // x: this.processids,
           data: {
             org: `${this.$login.f.orgs}`,
-            orgid: this.$login.f.orgid
+            id: `${this.$login.f.id}`
           }
         }
       }