apply-clients 4.0.66 → 4.0.67

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

@@ -1,239 +1,239 @@
-<template>
-  <div class="d1 flex">
-    <div class="left col-sm-12" v-if="showfunction">
-      <criteria-paged :model="model" v-ref:cp>
-        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-          <form novalidate class="" partial>
-            <div class="col-sm-10">
-              <div class="col-sm-1">
-                <div class="col-sm-12">
-                  <input type="text" class="form-control" v-model="model.f_user_name" v-on:keyup.enter="search"
-                         condition="f_user_name like '%{}%'" placeholder="客户名称">
-                </div>
-              </div>
-              <div class="col-sm-1">
-                <div class="col-sm-12">
-                  <input type="text" class="form-control" v-model="model.f_phone" v-on:keyup.enter="search"
-                         condition="f_phone like '%{}%'" placeholder="电话号码">
-                </div>
-              </div>
-              <div class="col-sm-1">
-                <div class="col-sm-12">
-                  <input type="text" class="form-control" v-model="model.f_apply_num" v-on:keyup.enter="search"
-                         condition="f_apply_num like '%{}%'" placeholder="报建编号">
-                </div>
-              </div>
-              <div class="col-sm-2">
-                <!--<label  class="col-sm-6"><nobr> 地址：</nobr></label>-->
-                <div class="col-sm-12">
-                  <input type="text" placeholder="地址" class="form-control" v-model="model.f_address" v-on:keyup.enter="search"
-                  condition="f_address like '%{}%'" >
-                </div>
-              </div>
-              <!--<div class="col-sm-2">-->
-                <!--&lt;!&ndash;<label for="f_user_name" class="col-sm-6"><nobr> 小区：</nobr></label>&ndash;&gt;-->
-                <!--<div class="col-sm-11">-->
-                  <!--<input type="text" class="form-control" v-model="model.f_residential_area" v-on:keyup.enter="search"-->
-                         <!--condition="f_residential_area like '%{}%'" placeholder="小区">-->
-                <!--</div>-->
-              <!--</div>-->
-              <div class="col-sm-2">
-                <!--<label for="f_user_name" class="col-sm-6"><nobr> 用户类型：</nobr></label>-->
-                <div class="col-sm-11" v-if="this.$login.f.f_fengongsi.includes('中燃')">
-                  <v-select :options="$parent.$parent.fapplytype" placeholder='用气性质' condition="f_user_type  = '{}'"
-                            v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
-                  </v-select>
-                </div>
-                <div class="col-sm-11" v-else>
-                  <v-select :options="$parent.$parent.usertype" placeholder='用气性质' condition="f_gas_type  like '%{}%'"
-                            v-model="model.f_gas_type" :value.sync="model.f_gas_type" close-on-select>
-                  </v-select>
-                </div>
-              </div>
-              <div class="col-sm-2 form-group form-input-group">
-                <label class="control-label">办理环节</label>
-                <v-select @change="$dispatch('setQueryCondition',model)" :options="$parent.$parent.defnames"
-                          condition="defname = '{}'" placeholder='流程环节'
-                          v-model="model.defname" :value.sync="model.defname" close-on-select>
-                </v-select>
-              </div>
-              <div class="col-sm-1 form-group">
-                <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.f_is_gas" placeholder='现场勘察' condition="f_is_gas = '{}'"
-                          v-model="model.f_is_gas" :value.sync="model.f_is_gas" close-on-select>
-                </v-select>
-              </div>
-              <!--<div class="col-sm-2">-->
-                <!--&lt;!&ndash;<label for="f_user_type" class="col-sm-6"><nobr> 流程状态：</nobr></label>&ndash;&gt;-->
-                <!--<div class="col-sm-12">-->
-                  <!--<v-select :options="$parent.$parent.defnameType" placeholder='流程状态'-->
-                            <!--condition="act.defname  = '{}'"-->
-                            <!--v-model="model.defname" :value.sync="model.defname" close-on-select>-->
-                  <!--</v-select>-->
-                <!--</div>-->
-              <!--</div>-->
-              <!--<div class="col-sm-2">-->
-                <!--&lt;!&ndash;<label for="f_user_name" class="col-sm-6"><nobr> 报建类型：</nobr></label>&ndash;&gt;-->
-                <!--<div class="col-sm-12" v-if="!this.$login.f.f_fengongsi.includes('中燃')">-->
-                  <!--<v-select :options="$parent.$parent.applytype" placeholder='报建类型' condition="f_apply_type  like '%{}%'"-->
-                            <!--v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>-->
-                  <!--</v-select>-->
-                <!--</div>-->
-              <!--</div>-->
-            </div>
-
-            <div class="col-sm-2">
-              <center>
-                <div class="col-sm-10  pull-right">
-                  <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()">
-                  <span class="glyphicon glyphicon-search"></span>{{$parent.$parent.buttonmsg=='查询'?'查询':'返回'}}</button>
-                </div>
-              </center>
-            </div>
-          </form>
-        </criteria>
-        <data-grid :model="model" partial='list' v-ref:grid class="data-grid" is-fixed='false' style="overflow-x:auto">
-          <template partial='head'>
-            <tr class="title">
-              <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>
-            </tr>
-          </template>
-          <template partial='body'>
-            <tr>
-              <td  style="text-align: center;">
-                <nobr>{{$index+1}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.defname}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_user_name}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{$getJsonName(row.f_address)}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gas_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.defname}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_apply_date}}</nobr>
-              </td>
-              <!--<td style="text-align: center;">-->
-                <!--<nobr>{{row.f_apply_count}}</nobr>-->
-              <!--</td>-->
-              <td style="text-align: center;">
-                <dropdown v-if="row.defname != '完工'">
-                  <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
-                    <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
-                  </button>
-                  <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-                    <li v-for="(index,func) in ($function_vue.functions?$function_vue.functions:functions)">
-                      <a href="#" @click="$dispatch('func',func,row)">{{func.title}}</a>
-                    </li>
-                  </ul>
-                </dropdown>
-              </td>
-            </tr>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-<script>
-  import {
-    PagedList
-  } from 'vue-client'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建业务信息',
-    data() {
-      return {
-        defnames:[],
-        usertype: [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
-        defnameType: [{label: '全部', value: ''}, ...this.$appdata.getParam('流程状态')],
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        f_is_gas: [{label:"全部",value:''}, {label:"符合规范要求",value:'符合规范要求'}, {label:"不符合规范要求",value:'不符合规范要求'}],
-        //中燃 专用
-        fapplytype: this.$appdata.getParam('用户类型'),
-        showbtn: false,
-        model: new PagedList('rs/sql/checkuserfunction', 20, {
-          data: {
-            id: this.$login.f.id,
-            fengongsi: this.$login.f.f_fengongsi
-          }
-        }),
-        buttonmsg:'查询',
-        condition: '',
-        showfunction:true,
-        functions:[]
-      }
-    },
-    beforeCreate(){
-      this.defnameType = [{label: '全部', value: ''}, ...this.$appdata.getParam('流程状态')]
-    },
-    ready() {
-      let http = new HttpResetClass()
-      http.load('POST', 'rs/sql/getDefnamesForActivityins', {data: {}}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then((res) => {
-        //  先获取所有流程环节
-        this.defnames = [{label: '全部', value: ''}]
-        for (let i = 0; i < res.data.length; i++) {
-          this.defnames.push({label: res.data[i].defname, value: res.data[i].defname})
-        }
-      })
-      this.$refs.cp.$refs.cri.search()
-      this.functions =  [
-          {
-            "title": "终止报建"
-          }
-        ]
-      this.showfunction =false
-      this.$nextTick(()=>{
-        this.showfunction =true
-      })
-      console.log('this.$appdata：',this.$appdata.getParam())
-    },
-    methods: {
-      clifun(row) {
-        this.$refs.cp.$refs.grid.model.rows = [row]
-        this.$refs.cp.pager = false
-        this.$dispatch('showbtn', row)
-      },
-      showpager() {
-        this.$refs.cp.pager = true
-        this.$dispatch('hiddenbtn')
-      }
-    }
-  }
-</script>
+<template>
+  <div class="d1 flex">
+    <div class="left col-sm-12" v-if="showfunction">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+          <form novalidate class="" partial>
+            <div class="col-sm-10">
+              <div class="col-sm-1">
+                <div class="col-sm-12">
+                  <input type="text" class="form-control" v-model="model.f_user_name" v-on:keyup.enter="search"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
+              </div>
+              <div class="col-sm-1">
+                <div class="col-sm-12">
+                  <input type="text" class="form-control" v-model="model.f_phone" v-on:keyup.enter="search"
+                         condition="f_phone like '%{}%'" placeholder="电话号码">
+                </div>
+              </div>
+              <div class="col-sm-1">
+                <div class="col-sm-12">
+                  <input type="text" class="form-control" v-model="model.f_apply_num" v-on:keyup.enter="search"
+                         condition="f_apply_num like '%{}%'" placeholder="报建编号">
+                </div>
+              </div>
+              <div class="col-sm-2">
+                <!--<label  class="col-sm-6"><nobr> 地址：</nobr></label>-->
+                <div class="col-sm-12">
+                  <input type="text" placeholder="地址" class="form-control" v-model="model.f_address" v-on:keyup.enter="search"
+                  condition="f_address like '%{}%'" >
+                </div>
+              </div>
+              <!--<div class="col-sm-2">-->
+                <!--&lt;!&ndash;<label for="f_user_name" class="col-sm-6"><nobr> 小区：</nobr></label>&ndash;&gt;-->
+                <!--<div class="col-sm-11">-->
+                  <!--<input type="text" class="form-control" v-model="model.f_residential_area" v-on:keyup.enter="search"-->
+                         <!--condition="f_residential_area like '%{}%'" placeholder="小区">-->
+                <!--</div>-->
+              <!--</div>-->
+              <div class="col-sm-2">
+                <!--<label for="f_user_name" class="col-sm-6"><nobr> 用户类型：</nobr></label>-->
+                <div class="col-sm-11" v-if="this.$login.f.f_fengongsi.includes('中燃')">
+                  <v-select :options="$parent.$parent.fapplytype" placeholder='用气性质' condition="f_user_type  = '{}'"
+                            v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-11" v-else>
+                  <v-select :options="$parent.$parent.usertype" placeholder='用气性质' condition="f_gas_type  like '%{}%'"
+                            v-model="model.f_gas_type" :value.sync="model.f_gas_type" close-on-select>
+                  </v-select>
+                </div>
+              </div>
+              <div class="col-sm-2 form-group form-input-group">
+                <label class="control-label">办理环节</label>
+                <v-select @change="$dispatch('setQueryCondition',model)" :options="$parent.$parent.defnames"
+                          condition="defname = '{}'" placeholder='流程环节'
+                          v-model="model.defname" :value.sync="model.defname" close-on-select>
+                </v-select>
+              </div>
+              <div class="col-sm-1 form-group">
+                <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.f_is_gas" placeholder='现场勘察' condition="f_is_gas = '{}'"
+                          v-model="model.f_is_gas" :value.sync="model.f_is_gas" close-on-select>
+                </v-select>
+              </div>
+              <!--<div class="col-sm-2">-->
+                <!--&lt;!&ndash;<label for="f_user_type" class="col-sm-6"><nobr> 流程状态：</nobr></label>&ndash;&gt;-->
+                <!--<div class="col-sm-12">-->
+                  <!--<v-select :options="$parent.$parent.defnameType" placeholder='流程状态'-->
+                            <!--condition="act.defname  = '{}'"-->
+                            <!--v-model="model.defname" :value.sync="model.defname" close-on-select>-->
+                  <!--</v-select>-->
+                <!--</div>-->
+              <!--</div>-->
+              <!--<div class="col-sm-2">-->
+                <!--&lt;!&ndash;<label for="f_user_name" class="col-sm-6"><nobr> 报建类型：</nobr></label>&ndash;&gt;-->
+                <!--<div class="col-sm-12" v-if="!this.$login.f.f_fengongsi.includes('中燃')">-->
+                  <!--<v-select :options="$parent.$parent.applytype" placeholder='报建类型' condition="f_apply_type  like '%{}%'"-->
+                            <!--v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>-->
+                  <!--</v-select>-->
+                <!--</div>-->
+              <!--</div>-->
+            </div>
+
+            <div class="col-sm-2">
+              <center>
+                <div class="col-sm-10  pull-right">
+                  <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()">
+                  <span class="glyphicon glyphicon-search"></span>{{$parent.$parent.buttonmsg=='查询'?'查询':'返回'}}</button>
+                </div>
+              </center>
+            </div>
+          </form>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid class="data-grid" is-fixed='false' style="overflow-x:auto">
+          <template partial='head'>
+            <tr class="title">
+              <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>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td  style="text-align: center;">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.defname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{$getJsonName(row.f_address)}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.defname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_apply_date}}</nobr>
+              </td>
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_apply_count}}</nobr>-->
+              <!--</td>-->
+              <td style="text-align: center;">
+                <dropdown v-if="row.defname != '完工'">
+                  <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                    <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                  </button>
+                  <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+                    <li v-for="(index,func) in ($function_vue.functions?$function_vue.functions:functions)">
+                      <a href="#" @click="$dispatch('func',func,row)">{{func.title}}</a>
+                    </li>
+                  </ul>
+                </dropdown>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+<script>
+  import {
+    PagedList
+  } from 'vue-client'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建业务信息',
+    data() {
+      return {
+        defnames:[],
+        usertype: [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
+        defnameType: [{label: '全部', value: ''}, ...this.$appdata.getParam('流程状态')],
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+        f_is_gas: [{label:"全部",value:''}, {label:"符合规范要求",value:'符合规范要求'}, {label:"不符合规范要求",value:'不符合规范要求'}],
+        //中燃 专用
+        fapplytype: this.$appdata.getParam('用户类型'),
+        showbtn: false,
+        model: new PagedList('rs/sql/checkuserfunction', 20, {
+          data: {
+            id: this.$login.f.id,
+            fengongsi: this.$login.f.f_fengongsi
+          }
+        }),
+        buttonmsg:'查询',
+        condition: '',
+        showfunction:true,
+        functions:[]
+      }
+    },
+    beforeCreate(){
+      this.defnameType = [{label: '全部', value: ''}, ...this.$appdata.getParam('流程状态')]
+    },
+    ready() {
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/sql/getDefnamesForActivityins', {data: {}}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        //  先获取所有流程环节
+        this.defnames = [{label: '全部', value: ''}]
+        for (let i = 0; i < res.data.length; i++) {
+          this.defnames.push({label: res.data[i].defname, value: res.data[i].defname})
+        }
+      })
+      this.$refs.cp.$refs.cri.search()
+      this.functions =  [
+          {
+            "title": "终止报建"
+          }
+        ]
+      this.showfunction =false
+      this.$nextTick(()=>{
+        this.showfunction =true
+      })
+      console.log('this.$appdata：',this.$appdata.getParam())
+    },
+    methods: {
+      clifun(row) {
+        this.$refs.cp.$refs.grid.model.rows = [row]
+        this.$refs.cp.pager = false
+        this.$dispatch('showbtn', row)
+      },
+      showpager() {
+        this.$refs.cp.pager = true
+        this.$dispatch('hiddenbtn')
+      }
+    }
+  }
+</script>

package/src/components/product/ImageUpload1.vue

@@ -241,7 +241,7 @@
                   上传
                 </button></div>
               <div v-if="!showq">
-                <img :src="row.f_downloadURL25" alt="图片加载失败" STYLE="height: 200px;width: 200px"/><hr>
+                <img :src="row.f_user_sure1" alt="图片加载失败" STYLE="height: 200px;width: 200px"/><hr>
                 <a class="btn btn-primary" target="_blank" :href="row.f_downloadURL25">预览</a>
                 <li class="btn btn-primary" @click="delet($index,row.f_downloadURL25,'f_downloadURL25')">删除</li>
               </div>
@@ -255,7 +255,7 @@
                   上传
                 </button></div>
               <div v-if="!showr">
-                <img :src="row.f_downloadURL26" alt="图片加载失败" STYLE="height: 200px;width: 200px"/><hr>
+                <img :src="row.f_user_sure2" alt="图片加载失败" STYLE="height: 200px;width: 200px"/><hr>
                 <a class="btn btn-primary" target="_blank" :href="row.f_downloadURL26">预览</a>
                 <li class="btn btn-primary" @click="delet($index,row.f_downloadURL26,'f_downloadURL26')">删除</li>
               </div>
@@ -304,7 +304,9 @@
                   f_process_2: null,
                   f_process_3: null
                 },
-                f_user_sure: null
+                f_user_sure: null,
+                f_user_sure1: null,
+                f_user_sure2: null
             }
         },
         methods: {
@@ -405,11 +407,11 @@
                   }
                 condition = null
                   console.log("流程1：" + this.imageData.f_process_1 + "--------流程2：" + this.imageData.f_process_2)
-                  if (this.imageData.f_process_1 != null && this.imageData.f_process_2 != null) {
+                  if (this.imageData.f_process_1 != null && this.imageData.f_process_2 != null && this.imageData.f_process_3 != null) {
                     console.log("进来否？？？")
-                    condition = `f_process_id = '${this.imageData.f_process_1}' or f_process_id = '${this.imageData.f_process_2}'`
-                  }else if (this.imageData.f_process_1 != null && this.imageData.f_process_2 != null && this.imageData.f_process_3 != null) {
                     condition = `f_process_id = '${this.imageData.f_process_1}' or f_process_id = '${this.imageData.f_process_2}' or f_process_id = '${this.imageData.f_process_3}'`
+                  }else if (this.imageData.f_process_1 != null && this.imageData.f_process_2 != null) {
+                    condition = `f_process_id = '${this.imageData.f_process_1}' or f_process_id = '${this.imageData.f_process_2}'`
                   }else {
                     condition = `f_process_id = '${this.imageData.f_process_1}'`
                   }
@@ -542,12 +544,14 @@
                         let temp = row.f_picture
                         let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
                         this.row.f_downloadURL25 = path +'' + URL
+                        this.f_user_sure1 = this.row.f_downloadURL25
                         this.showq = false
                       }
                       if (row.f_type === '其他文件2') {
                         let temp = row.f_picture
                         let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
                         this.row.f_downloadURL26 = path +'' + URL
+                        this.f_user_sure2 = this.row.f_downloadURL26
                         this.showr = false
                       }
                     }