apply-clients 7.1.36-yuchuan-14 → 7.1.36-yuchuan-15

package/src/components/product/GongJianPush/ApplyPushDispose.vue

@@ -4,91 +4,176 @@
       <form class="form-horizontal">
         <div class="row">
           <div class="col-sm-6" :class="[!model.f_user_name ? 'has-error' : '']">
-            <label class="font_normal_body">用户姓名</label>
-            <input type="text" v-model="model.f_user_name" disabled=disabled style="width: 60%" class="input_search">
+            <label class="font_normal_body">客户名称</label>
+            <input type="text" v-model="model.f_user_name" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_user_type ? 'has-error' : '']">
+            <label class="font_normal_body">客户类型</label>
+            <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                      placeholder='客户类型'
+                      :search="false"
+                      :value-single="true"
+                      :options='userTypes'
+                      close-on-select
+            ></v-select>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_contact ? 'has-error' : '']">
+            <label class="font_normal_body">联系人</label>
+            <input type="text" v-model="model.f_contact" style="width: 60%" class="input_search">
           </div>
           <div class="col-sm-6" :class="[!model.f_phone ? 'has-error' : '']">
-            <label class="font_normal_body">用户电话</label>
-            <input type="text" v-model="model.f_phone" disabled=disabled style="width: 60%" class="input_search">
+            <label class="font_normal_body">联系电话</label>
+            <input type="text" v-model="model.f_phone" style="width: 60%" class="input_search">
           </div>
         </div>
 
         <div class="row">
-          <div class="col-sm-6" :class="[!model.f_address ? 'has-error' : '']">
-            <label class="font_normal_body">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</label>
-            <input type="text" v-model="model.f_address" disabled=disabled style="width: 60%" class="input_search">
+          <div class="col-sm-6" :class="[!model.f_credentials ? 'has-error' : '']">
+            <label class="font_normal_body">证件类型</label>
+            <v-select :value.sync="model.f_credentials" v-model="model.f_credentials"
+                      placeholder='证件类型'
+                      :search="false"
+                      :value-single="true"
+                      :options='documentTypes'
+                      close-on-select
+            ></v-select>
           </div>
-          <div class="col-sm-6" :class="[!model.f_apply_num ? 'has-error' : '']">
-            <label class="font_normal_body">工程编号</label>
-            <input type="text" v-model="model.f_apply_num" style="width: 60%" class="input_search">
+          <div class="col-sm-6" :class="[!model.f_idnumber ? 'has-error' : '']">
+            <label class="font_normal_body">{{ model.f_credentials.includes('统一社会信用代码') ? '统一社会信用代码' : '证件号码' }}</label>
+            <input type="text" v-model="model.f_idnumber" style="width: 60%" class="input_search">
           </div>
         </div>
+
         <div class="row">
           <div class="col-sm-6" :class="[!model.f_apply_type ? 'has-error' : '']">
-            <label class="font_normal_body">报装类型</label>
-            <input type="text" v-model="model.f_apply_type" style="width: 60%" class="input_search">
+            <label class="font_normal_body">报建类型</label>
+            <v-select :value.sync="model.f_apply_type" v-model="model.f_apply_type"
+                      placeholder='报建类型'
+                      :search="false"
+                      :value-single="true"
+                      :options='applyTypes'
+                      close-on-select
+            ></v-select>
           </div>
           <div class="col-sm-6" :class="[!model.f_apply_source ? 'has-error' : '']">
-            <label class="font_normal_body">报装来源</label>
-            <input type="text" v-model="model.f_apply_source" style="width: 60%" class="input_search">
+            <label class="font_normal_body">报建来源</label>
+            <v-select :value.sync="model.f_apply_source" v-model="model.f_apply_source"
+                      placeholder='报建来源'
+                      :search="false"
+                      :value-single="true"
+                      :options='applySources'
+                      close-on-select
+            ></v-select>
           </div>
         </div>
 
         <div class="row">
-          <div class="col-sm-6" :class="[!model.f_apply_nature ? 'has-error' : '']">
-            <label class="font_normal_body">报建性质</label>
-            <input type="text" v-model="model.f_apply_nature" style="width: 60%" class="input_search">
-          </div>
-          <div class="col-sm-6" :class="[!model.defname ? 'has-error' : '']">
-            <label class="font_normal_body">办理环节</label>
-            <input type="text" v-model="model.defname" style="width: 60%" class="input_search"
-                   v-validate:f_status='{required: true}'>
-          </div>
-          <div class="col-sm-6" :class="[!model.f_sub_state ? 'has-error' : '']">
-            <label class="font_normal_body">流程状态</label>
-            <input type="text" v-model="model.f_sub_state" style="width: 60%" class="input_search"
-                   v-validate:f_dispose_phone='{required: true}'>
-          </div>
-          <div class="col-sm-6" :class="[!model.f_apply_date ? 'has-error' : '']">
-            <label class="font_normal_body">报建日期</label>
-            <datepicker id="f_bill_date" placeholder="报建日期" style="width:60%"
-                        v-model="model.f_apply_date"
-                        :value.sync="model.f_apply_date"
-                        :format="'yyyy-MM-dd HH:mm:ss'"
-                        :show-reset-button="true"
-                        v-validate:f_apply_date='{required: true}'>
-            </datepicker>
+          <div class="col-sm-6" :class="[!model.f_order_address ? 'has-error' : '']">
+            <label class="font_normal_body">预约地址</label>
+            <input type="text" v-model="model.f_order_address" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_quantity ? 'has-error' : '']">
+            <label class="font_normal_body">申请户数</label>
+            <input type="text" v-model="model.f_quantity" style="width: 60%" class="input_search">
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_auth_type ? 'has-error' : '']">
+            <label class="font_normal_body">认证类型</label>
+            <v-select :value.sync="model.f_auth_type" v-model="model.f_auth_type"
+                      placeholder='认证类型'
+                      :search="false"
+                      :value-single="true"
+                      :options='authTypes'
+                      close-on-select
+            ></v-select>
+          </div>
+          <div class="col-sm-6" :class="[!model.f_invoice_type ? 'has-error' : '']">
+            <label class="font_normal_body">票据类型</label>
+            <v-select :value.sync="model.f_invoice_type" v-model="model.f_invoice_type"
+                      placeholder='票据类型'
+                      :search="false"
+                      :search="false"
+                      :value-single="true"
+                      :options='invoicesTypes'
+                      close-on-select
+            ></v-select>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_buy_name ? 'has-error' : '']">
+            <label class="font_normal_body">购方单位名称</label>
+            <input type="text" v-model="model.f_buy_name" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_buy_tax_id ? 'has-error' : '']">
+            <label class="font_normal_body">购方开票识别号</label>
+            <input type="text" v-model="model.f_buy_tax_id" style="width: 60%" class="input_search">
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_bank_account ? 'has-error' : '']">
+            <label class="font_normal_body">购方开户行及账号</label>
+            <input type="text" v-model="model.f_bank_account" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_address_phone ? 'has-error' : '']">
+            <label class="font_normal_body">购方地址电话</label>
+            <input type="text" v-model="model.f_address_phone" style="width: 60%" class="input_search">
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_note ? 'has-error' : '']">
+            <label class="font_normal_body">备注</label>
+            <input type="text" v-model="model.f_note" style="width: 60%" class="input_search">
           </div>
         </div>
+
         <div class="row">
           <div class="col-sm-6" :class="[!model.f_project_name ? 'has-error' : '']">
             <label class="font_normal_body">项目名称</label>
-            <input type="text" v-model="model.f_project_name" style="width: 48%" class="input_search">
+            <input type="text" v-model="model.f_project_name" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_project_address ? 'has-error' : '']">
+            <label class="font_normal_body">项目地址</label>
+            <input type="text" v-model="model.f_project_address" style="width: 60%" class="input_search">
           </div>
-          <div class="col-sm-6">
+        </div>
+
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_land_acquisition_methods ? 'has-error' : '']">
             <label class="font_normal_body">土地获取方式</label>
             <v-select :value.sync="model.f_land_acquisition_methods" v-model="model.f_land_acquisition_methods"
                       placeholder='土地获取方式'
-                      value-single="true"
-                      :options='$parent.$parent.landMethods'
+                      :search="false"
+                      :value-single="true"
+                      :options='landMethods'
                       close-on-select
             ></v-select>
           </div>
+          <div class="col-sm-6" :class="[!model.f_land_area ? 'has-error' : '']">
+            <label class="font_normal_body">用地面积</label>
+            <input type="text" v-model="model.f_land_area" style="width: 60%" class="input_search">
+          </div>
         </div>
 
         <div class="row">
-          <div class="col-sm-12" :class="[!model.f_total_investment ? 'has-error' : '']">
+          <div class="col-sm-6" :class="[!model.f_total_investment ? 'has-error' : '']">
             <label class="font_normal_body">总投资(万元)</label>
-            <input type="text" v-model="model.f_total_investment" style="width: 30%"
-                   class="input_search">
+            <input type="text" v-model="model.f_total_investment" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_national_standard_industry ? 'has-error' : '']">
+            <label class="font_normal_body">国标行业</label>
+            <input type="text" v-model="model.f_national_standard_industry" style="width: 30%" class="input_search">
           </div>
-
         </div>
+
         <div class="row">
-          <div class="col-sm-12" :class="[!model.f_land_area ? 'has-error' : '']">
-            <label class="font_normal_body">用地面积</label>
-            <input type="text" v-model="model.f_land_area" style="width: 30%" class="input_search">
-          </div>
           <div class="col-sm-6" :class="[!model.f_open_date ? 'has-error' : '']">
             <label class="font_normal_body">拟开工时间</label>
             <datepicker id="f_bill_date" placeholder="拟开工时间" style="width:60%"
@@ -109,11 +194,8 @@
                         v-validate:f_success_date='{required: true}'>
             </datepicker>
           </div>
-          <div class="col-sm-12" :class="[!model.f_national_standard_industry ? 'has-error' : '']">
-            <label class="font_normal_body">国标行业</label>
-            <input type="text" v-model="model.f_national_standard_industry" style="width: 30%" class="input_search">
-          </div>
         </div>
+
         <div class="row">
           <div class="col-sm-12" :class="[!model.f_construction_content ? 'has-error' : '']">
             <label class="font_normal_body">建设规模及内容</label>
@@ -129,19 +211,19 @@
         type="button"
         class="btn button_search"
         :disabled="!isFormComplete()"
-        @click="save">接收
+        @click="save('受理')">受理
       </button>
       <button
         type="button"
         class="btn button_search"
         :disabled="!isFormComplete()"
-        @click="save">施工
+        @click="save('施工')">施工
       </button>
       <button
         type="button"
         class="btn button_search"
         :disabled="!isFormComplete()"
-        @click="save">完工
+        @click="save('完工')">完工
       </button>
       <button class="btn button_clear" @click="cancel">取消</button>
     </div>
@@ -149,19 +231,19 @@
 </template>
 
 <script>
-
 export default {
   title: '报警处置',
 
-  data() {
+  data () {
     return {
-      landMethods: [{label: '划拨用地', value: '划拨用地'}, {
-        label: '自有用地',
-        value: '自有用地'
-      }, {label: '公开出让用地', value: '公开出让用地'}, {label: '协议出让用地', value: '协议出让用地'}, {
-        label: '其他',
-        value: '其他'
-      }]
+      // [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
+      landMethods: [...this.$appdata.getParam('土地获取方式') ? this.$appdata.getParam('土地获取方式') : []],
+      documentTypes: [...this.$appdata.getParam('证件类型') ? this.$appdata.getParam('证件类型') : []],
+      authTypes: [...this.$appdata.getParam('认证类型') ? this.$appdata.getParam('认证类型') : []],
+      invoicesTypes: [...this.$appdata.getParam('票据类型') ? this.$appdata.getParam('票据类型') : []],
+      applySources: [...this.$appdata.getParam('报建来源') ? this.$appdata.getParam('报建来源') : []],
+      userTypes: [...this.$appdata.getParam('客户类型') ? this.$appdata.getParam('客户类型') : []],
+      applyTypes: [...this.$appdata.getParam('报建类型') ? this.$appdata.getParam('报建类型') : []]
     }
   },
 
@@ -171,22 +253,26 @@ export default {
     }
   },
   methods: {
-    isFormComplete() {
+    isFormComplete () {
       const model = this.model
       return (
-        model.f_user_name && model.f_user_phone && model.f_address && model.f_device_code && model.f_latest_alarm_value &&
-        model.f_alarm_type && model.f_latest_alarm_level && model.f_latest_alarm_time && model.f_dispose_status &&
-        model.f_dispose_person && model.f_dispose_phone && model.f_status && model.f_dispose_time && model.f_explain
+        model.f_user_name && model.f_user_type && model.f_contact && model.f_phone && model.f_credentials &&
+        model.f_idnumber && model.f_apply_type && model.f_apply_source && model.f_order_address &&
+        model.f_quantity && model.f_auth_type && model.f_invoice_type && model.f_buy_name && model.f_buy_tax_id &&
+        model.f_bank_account && model.f_address_phone && model.f_note && model.f_project_name &&
+        model.f_project_address && model.f_land_acquisition_methods && model.f_land_area && model.f_total_investment &&
+        model.f_national_standard_industry && model.f_open_date && model.f_success_date && model.f_construction_content
       )
     },
-    cancel() {
+    cancel () {
       this.$dispatch('close')
     },
     addressValid (val) {
       console.log(val)
     },
-    save () {
-      this.$resetpost('rs/logic/pushAlarmDispose', {data: this.model}).then((res) => {
+    save (status) {
+      this.model.f_state = status
+      this.$resetpost('/third/rs/logic/gjPushData', {data: this.model}).then((res) => {
         console.log('this.model', this.model)
       })
       this.$dispatch('close')
@@ -202,5 +288,9 @@ export default {
   margin: 20px 40px;
 }
 
+label {
+  width: 130px;
+}
+
 
 </style>

package/src/components/product/GongJianPush/ApplyPushList.vue

@@ -1,7 +1,6 @@
 <template>
-  <div style="flex:1;" class="flex">
     <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.search'>
+      <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.searchCondition'>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="col-sm-2">
             <label class="font_normal_body">客户名称</label>
@@ -14,10 +13,10 @@
           <div class="col-sm-2">
             <label class="font_normal_body">工程编号</label>
             <input type="text" class="input_search" style="width:60%"
-                   v-model="model.f_apply_num"
+                   v-model="model.f_project_code"
                    placeholder='工程编号'
-                   :size="model.f_apply_num ? model.f_apply_num.length : 10"
-                   condition="f_apply_num like '%{}%'">
+                   :size="model.f_project_code ? model.f_project_code.length : 10"
+                   condition="f_project_code like '%{}%'">
           </div>
           <div class="col-sm-2">
             <label class="font_normal_body">联系电话</label>
@@ -25,15 +24,15 @@
                    v-model="model.f_phone"
                    placeholder='联系电话'
                    :size="model.f_phone ? model.f_phone.length : 11"
-                   condition="f_apply_num like '%{}%'">
+                   condition="f_phone like '%{}%'">
           </div>
           <div class="col-sm-2">
             <label class="font_normal_body">用户地址</label>
             <input type="text" class="input_search" style="width:60%"
-                   v-model="model.f_address"
+                   v-model="model.f_project_address"
                    placeholder='用户地址'
-                   :size="model.f_address ? model.f_address.length : 11"
-                   condition="f_address like '%{}%'">
+                   :size="model.f_project_address ? model.f_project_address.length : 11"
+                   condition="f_project_address like '%{}%'">
           </div>
           <div class="col-sm-2">
             <label class="font_normal_body">报建类型</label>
@@ -45,26 +44,6 @@
                       condition="f_apply_type = '{}'"
             ></v-select>
           </div>
-          <div class="col-sm-2">
-            <label class="font_normal_body">办理环节</label>
-            <v-select :value.sync="model.f_apply_type" v-model="model.f_apply_type"
-                      placeholder='办理环节'
-                      value-single="true"
-                      :options='$parent.$parent.handingLinks'
-                      close-on-select
-                      condition="f_apply_type = '{}'"
-            ></v-select>
-          </div>
-          <div class="col-sm-2">
-            <label class="font_normal_body">报建性质</label>
-            <v-select :value.sync="model.f_apply_nature" v-model="model.f_apply_nature"
-                      placeholder='报建性质'
-                      value-single="true"
-                      :options='$parent.$parent.applyNature'
-                      close-on-select
-                      condition="f_apply_nature = '{}'"
-            ></v-select>
-          </div>
           <div class="col-sm-2">
             <label class="font_normal_body">报建来源</label>
             <v-select :value.sync="model.f_apply_source" v-model="model.f_apply_source"
@@ -75,6 +54,16 @@
                       condition="f_apply_source = '{}'"
             ></v-select>
           </div>
+          <div class="col-sm-2">
+            <label class="font_normal_body">状态</label>
+            <v-select :value.sync="model.f_process_state" v-model="model.f_process_state"
+                      placeholder='状态'
+                      value-single="true"
+                      :options='$parent.$parent.processState'
+                      close-on-select
+                      condition="f_process_state = '{}'"
+            ></v-select>
+          </div>
           <div class="form-group col-sm-2">
             <label  for="startDate" class="font_normal_body">开始时间</label>
             <datepicker id="startDate" placeholder="开始日期"
@@ -83,7 +72,7 @@
                         :value.sync="model.startDate"
                         :format="'yyyy-MM-dd 00:00:00'"
                         :show-reset-button="true"
-                        condition="f_apply_date >= '{}'">
+                        condition="f_orderdate >= '{}'">
             </datepicker>
           </div>
           <div class="form-group col-sm-2">
@@ -94,7 +83,7 @@
                         :value.sync="model.endDate"
                         :format="'yyyy-MM-dd 23:59:59'"
                         :show-reset-button="true"
-                        condition="f_apply_date <= '{}'">
+                        condition="f_orderdate <= '{}'">
             </datepicker>
           </div>
           <div class="col-sm-2 form-group" style="float:right">
@@ -104,7 +93,11 @@
           </div>
         </div>
       </criteria>
-      <data-grid id="queryinstruct" partial='list' class="list_area table_sy" v-ref:grid :model="model">
+      <data-grid :model="model"
+                 partial='list'
+                 style="overflow: auto"
+                 class="list_area table_sy"
+                 v-ref:grid >
         <template partial='head'>
           <tr>
             <th style="text-align:center"><nobr>工程编号</nobr></th>
@@ -112,30 +105,27 @@
             <th style="text-align:center"><nobr>电话</nobr></th>
             <th style="text-align:center"><nobr>地址</nobr></th>
             <th style="text-align:center"><nobr>来源</nobr></th>
+            <th style="text-align:center"><nobr>状态</nobr></th>
             <th style="text-align:center"><nobr>报建类型</nobr></th>
-            <th style="text-align:center"><nobr>报建性质</nobr></th>
-            <th style="text-align:center"><nobr>办理环节</nobr></th>
-            <th style="text-align:center"><nobr>流程状态</nobr></th>
-            <th style="text-align:center"><nobr>报建日期</nobr></th>
+            <th style="text-align:center"><nobr>土地获取方式</nobr></th>
+            <th style="text-align:center"><nobr>建设规模及内容</nobr></th>
           </tr>
         </template>
-        <template partial='body'>
+        <template partial='body' style="height: 80vh">
           <tr>
-            <td style="text-align:center"><nobr>{{ row.f_apply_num }}</nobr></td>
+            <td style="text-align:center"><nobr>{{ row.f_project_code }}</nobr></td>
             <td style="text-align:center"><nobr>{{ row.f_user_name }}</nobr></td>
             <td style="text-align:center"><nobr>{{ row.f_phone }}</nobr></td>
-            <td style="text-align:center"><nobr>{{ row.f_address }}</nobr></td>
+            <td style="text-align:center"><nobr>{{ row.f_project_address }}</nobr></td>
             <td style="text-align:center"><nobr>{{ row.f_apply_source }}</nobr></td>
+            <td style="text-align:center"><nobr>{{ row.f_process_state }}</nobr></td>
             <td style="text-align:center"><nobr>{{ row.f_apply_type }}</nobr></td>
-            <td style="text-align:center"><nobr>{{ row.f_apply_nature }}</nobr></td>
-            <td style="text-align:center"><nobr>{{ row.defname }}</nobr></td>
-            <td style="text-align:center"> <nobr>{{ row.f_sub_state }}</nobr></td>
-            <td style="text-align:center"><nobr>{{ row.f_apply_date }}</nobr></td>
+            <td style="text-align:center"><nobr>{{ row.f_land_acquisition_methods }}</nobr></td>
+            <td style="text-align:center"><nobr>{{ row.f_construction_content }}</nobr></td>
           </tr>
         </template>
       </data-grid>
     </criteria-paged>
-  </div>
 </template>
 
 <script>
@@ -145,12 +135,12 @@ export default {
   title: '政府报建',
   data () {
     return {
-      model: new PagedList('rs/sql/getApplyPushList', 30),
+      model: new PagedList('rs/sql/getApplyPushList', 30, null),
       row: null,
-      applyNature: [{label: '全部', value: ''}, {label: '散户', value: '散户'}, {label: '小区', value: '小区'},{label: '商业', value: '商业'},{label: '工业', value: '工业'}],
-      applySource: [{label: '全部', value: ''}, {label: '微信公众号', value: '微信公众号'}, {label: '线下发起', value: '线下发起'}],
-      applyType: [{label: '全部', value: ''}, {label: '民用报建', value: '民用报建'}, {label: '非民用报建', value: '非民用报建'}],
+      applyType: [{label: '全部', value: ''}, {label: '散户', value: '散户'}, {label: '小区', value: '小区'},{label: '商业', value: '商业'},{label: '工业', value: '工业'}],
+      applySource: [{label: '全部', value: ''}, {label: '燃气公司', value: '燃气公司'}, {label: '工建', value: '工建'}],
       handingLinks: [{label: '全部', value: ''}, {label: '报装申请', value: '报装申请'}, {label: '报建受理', value: '报建受理'}, {label: '现场勘察', value: '现场勘察'}, {label: '收费标准', value: '收费标准'}, {label: '报装缴费', value: '报装缴费'}, {label: '合同签订', value: '合同签订'}, {label: '设计出图', value: '设计出图'}, {label: '工程派工', value: '工程派工'}, {label: '工程队派工', value: '工程队派工'}, {label: '监理单位派工', value: '监理单位派工'}, {label: '工程施工', value: '工程施工'}, {label: '点火通气', value: '点火通气'}, {label: '完工', value: '完工'}],
+      processState: [{label: '全部', value: ''}, {label: '受理', value: '受理'}, {label: '施工', value: '施工'}, {label: '完工', value: '完工'},
       criteriaShow: false,
       isdeal: true
     }
@@ -161,7 +151,7 @@ export default {
     }
   },
   ready () {
-    this.search({condition: ' 1 = 1 '})
+    this.search()
   },
   load () {
   },
@@ -169,10 +159,15 @@ export default {
   },
   methods: {
     search (args) {
+      // this.$refs.cp.$refs.cri.search()
+      this.$dispatch('search')
+    },
+    searchCondition (args) {
       args.condition += this.orgcondition ? this.orgcondition : ''
-      console.log('args.condition' + args.condition)
-      this.condition = args.condition
+      args.tablename = 't_third_apply'
+      console.log('看看是啥', args)
       this.model.search(args.condition, args.model)
+      // this.$dispatch('search')
     },
     idsearch () {
       this.$emit('add', '111')
@@ -188,7 +183,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 .form-input-group label {
   text-align: right;
   width: auto;

package/src/components/product/GongJianPush/ApplyPushManage.vue

@@ -1,11 +1,11 @@
 <template>
-  <div id="unit" class="row" :class="{'binary':showItem}">
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
     <div :class="{'basic-main':!showItem,'binary-left':showItem}">
       <gongjian-apply-list @select-changed="idsearch" :styles="showItem?'col-sm-3':'col-sm-2'" v-if="stepControl"
                             v-ref:jgDeviceAlarmlist @add="add"></gongjian-apply-list>
     </div>
-    <div class="binary-right">
-      <gongjian-apply-dispose :recordlist="recordlist" :model="model" :oldmodel="oldmodel" v-show="showItem"
+    <div class="binary-right"  v-show="showItem">
+      <gongjian-apply-dispose :recordlist="recordlist" :model="model" :oldmodel="oldmodel"
                                :f_distribution_state="f_distribution_state" :row="row" :rowsdata="rowsdata1"
                                :warehousename="warehousename"
       ></gongjian-apply-dispose>
@@ -28,7 +28,7 @@ export default {
 
       // 分公司id串
       width: '100%',
-      f_filialeids: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气',
+      f_filialeids: this.$login.f.orgs,
       areaShow: false,
       areatype: '小区',
       arearow: {},
@@ -66,6 +66,7 @@ export default {
     },
     refresh() {
       this.areaShow = false
+      this.showItem = false
       this.$refs.arealist.$refs.paged.$refs.cri.search()
     },
     idsearch(row) {