apply-clients 5.0.35-ezhou-6 → 5.0.35-ezhou-8

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

@@ -178,7 +178,8 @@ export default {
         f_operator: this.$login.f.name,
         f_filiale: this.$login.f.f_fengongsi
       },
-      models2:{}
+      models2:{},
+      selectShow: false
     }
   },
   methods: {
@@ -223,7 +224,11 @@ export default {
         f_apply_source:this.models2.f_apply_source,
         f_sub_state:'未完工',
         f_project_number : res1.data.f_apply_num,
-        user:this.$login.f
+        user:{
+          id: this.$login.f.id,
+          name: this.$login.f.name,
+          ename: this.$login.f.ename
+        }
       }
       await http.load('POST','rs/logic/newaddApplyproduct',{data:data}, {resolveMsg: null, rejectMsg: '转发失败，请联系开发人员'})
       var flag = false
@@ -1388,7 +1393,9 @@ export default {
           // 控制设置级联
           // 源select所选的值 this.$refs.service_show.data.activitys.fields[index].value
           if (this.$refs.service_show.data.fields[i].label === '街道名称') {
-            this.$refs.service_show.data.fields[i].value = ''
+            if (!this.selectShow){
+              this.$refs.service_show.data.fields[i].value = ''
+            }
             let street = await this.$resetpost('rs/sql/singleTable', {
               data: {
                 tablename: 't_street',
@@ -1557,8 +1564,9 @@ export default {
           // 控制设置级联
           // 源select所选的值 this.$refs.service_show.data.activitys.fields[index].value
           if (this.$refs.service_show.data.fields[i].label === '小区名称') {
-            this.$refs.service_show.data.fields[i].value = ''
-
+            if (!this.selectShow){
+              this.$refs.service_show.data.fields[i].value = ''
+            }
             let area = await this.$resetpost('rs/sql/singleTable', {
               data: {
                 tablename: 't_area',
@@ -2240,6 +2248,7 @@ export default {
           this.$refs.service_show.data.fields[i].value = row.f_aroundmeter
         }
       }
+      this.selectShow = true
       console.log("当前数据",JSON.stringify(this.$refs.service_show.data))
     }
   }

package/src/components/product/Process/Processes/selectUserinfo.vue

@@ -1,183 +1,184 @@
-<template>
-  <div style="margin-bottom: 20px;" class="form-group select-overspread">
-    <label class="control-label-justify control-label col-sm-3">选择用户</label>
-    <div class="col-sm-10" style="top: 42px;">
-      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openSelect" :disabled="mark === 1">选择</button>
-    </div>
-  </div>
-
-  <modal v-if="showselect" :show.sync="showselect" width="80%" title="用户信息" v-ref:modal large backdrop="false">
-    <article slot="modal-body" class="modal-body" style="height: 600px!important;">
-      <criteria-paged :model="model" v-ref:cp>
-        <criteria partial='criteria' @condition-changed='$parent.$parent.searchCondition' v-ref:cri>
-          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-            <div class="row">
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户编号：</label>
-                <input type="text" style="width:60%" class="input_search" placeholder='客户编号' v-model="model.f_userinfo_code"
-                       v-on:keyup.enter="search"
-                       condition="ui.f_userinfo_code = '{}'">
-              </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户名称：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                       v-on:keyup.enter="search" condition="ui.f_user_name like '%{}%'" placeholder='客户名称'>
-              </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户电话：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
-                       v-on:keyup.enter="search" condition="ui.f_user_phone = '{}'" placeholder='客户电话'>
-              </div>
-
-              <div class="form-group col-sm-3 button-range">
-                <button class="button_search button_spacing" @click.prevent="search" v-el:cx>查询</button>
-                <button class="button_clear button_spacing"  @click.prevent="$parent.$parent.$parent.clear()">清空</button>
-                <div
-                  :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
-                  @click="$parent.$parent.$parent.criteriaShow = !$parent.$parent.$parent.criteriaShow"
-                  class="button_spacing"
-                  style="float: right">
-                </div>
-              </div>
-            </div>
-            <div class="row" v-show="$parent.$parent.$parent.criteriaShow">
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户地址：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
-                       v-on:keyup.enter="search" condition="ua.f_address like '%{}%'" placeholder='客户地址'>
-              </div>
-            </div>
-          </div>
-        </criteria>
-        <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" style="height: 100%">
-          <template partial='head'>
-            <tr>
-              <th style="white-space: nowrap;">序号</th>
-              <th style="white-space: nowrap;">客户编号</th>
-              <th style="white-space: nowrap;">客户名称</th>
-              <th style="white-space: nowrap;">客户电话</th>
-              <th style="white-space: nowrap;">地址信息</th>
-              <th style="white-space: nowrap;">选择</th>
-            </tr>
-          </template>
-          <template partial='body'>
-            <tr >
-              <td style="text-align: center;">
-                <nobr><font>{{$index+1}}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{ row.f_userinfo_code }}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{ row.f_user_name }}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{ row.f_user_phone }}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>{{ row.f_address }}</font></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr><font>
-                  <button type="button" name="button" class="button_export" @click.prevent="$parent.$parent.$parent.$parent.select(row)">确认选择</button>
-                </font></nobr>
-              </td>
-            </tr>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-    </footer>
-  </modal>
-</template>
-<script>
-import {PagedList} from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '收费管理',
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 0
-    }
-  },
-  data () {
-    return {
-      showselect: false,
-      model: new PagedList('rs/sql/applyGetUserinfos', 20, null),
-      criteriaShow: false
-    }
-  },
-  ready () {
-  },
-  methods: {
-    select (row) {
-      this.$dispatch('selectUserinfo', row)
-
-      this.showselect = false
-    },
-    searchCondition (args) {
-      args.condition = `${args.condition}`
-
-      this.model.search(args.condition, args.model)
-    },
-    clear () {
-      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = null
-      })
-    },
-    openSelect () {
-      this.showselect = true
-      setTimeout(() => {
-        this.$refs.cp.$refs.cri.search()
-      }, 100)
-    }
-  },
-  events: {
-  },
-  computed: {
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped>
-.control-label-justify {
-  top: 42px;
-  display: inline-block;
-  vertical-align: top;
-  width: 110px;
-  text-align: justify;
-  font-family: PingFang-SC-Bold;
-}
-
-.control-label-justify::after {
-  content: "";
-  display: inline-block;
-  width: 100%;
-  overflow: hidden;
-  height: 0;
-}
-.input_view{
-  padding: 8px;
-  background-color: #ffffff;
-  border-radius: 2px;
-  border: solid 1px #c7c7c7!important;
-  color: #333333!important;
-  font-size: 15px!important;
-}
-
-.input_view[readonly]{
-  border: 1px solid #DDD!important;
-  color:#ACA899!important;
-}
-.input_view:disabled{
-  border: 1px solid #DDD!important;
-  color:#ACA899!important;
-}
-</style>
+<template>
+  <div style="margin-bottom: 20px;" class="form-group select-overspread">
+    <label class="control-label-justify control-label col-sm-3">选择用户</label>
+    <div class="col-sm-10" style="top: 42px;">
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openSelect" :disabled="mark === 1">选择</button>
+    </div>
+  </div>
+
+  <modal v-if="showselect" :show.sync="showselect" width="80%" title="用户信息" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body" style="height: 600px!important;">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.$parent.searchCondition' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户编号：</label>
+                <input type="text" style="width:60%" class="input_search" placeholder='客户编号' v-model="model.f_userinfo_code"
+                       v-on:keyup.enter="search"
+                       condition="ui.f_userinfo_code = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="search" condition="ui.f_user_name like '%{}%'" placeholder='客户名称'>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户电话：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                       v-on:keyup.enter="search" condition="ui.f_user_phone = '{}'" placeholder='客户电话'>
+              </div>
+
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_search button_spacing" @click.prevent="search" v-el:cx>查询</button>
+                <button class="button_clear button_spacing"  @click.prevent="$parent.$parent.$parent.clear()">清空</button>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.$parent.criteriaShow = !$parent.$parent.$parent.criteriaShow"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户地址：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                       v-on:keyup.enter="search" condition="ua.f_address like '%{}%'" placeholder='客户地址'>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" style="height: 100%">
+          <template partial='head'>
+            <tr>
+              <th style="white-space: nowrap;">序号</th>
+              <th style="white-space: nowrap;">客户编号</th>
+              <th style="white-space: nowrap;">客户名称</th>
+              <th style="white-space: nowrap;">客户电话</th>
+              <th style="white-space: nowrap;">地址信息</th>
+              <th style="white-space: nowrap;">选择</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_userinfo_code }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_name }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_phone }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_address }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>
+                  <button type="button" name="button" class="button_export" @click.prevent="$parent.$parent.$parent.$parent.select(row)">确认选择</button>
+                </font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '收费管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showselect: false,
+      model: new PagedList('rs/sql/applyGetUserinfos', 20, null),
+      criteriaShow: false
+    }
+  },
+  ready () {
+  },
+  methods: {
+    select (row) {
+      console.log("当前传入数据ccc",row)
+      this.$dispatch('selectUserinfo', row)
+
+      this.showselect = false
+    },
+    searchCondition (args) {
+      args.condition = `${args.condition}`
+
+      this.model.search(args.condition, args.model)
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    openSelect () {
+      this.showselect = true
+      setTimeout(() => {
+        this.$refs.cp.$refs.cri.search()
+      }, 100)
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.control-label-justify {
+  top: 42px;
+  display: inline-block;
+  vertical-align: top;
+  width: 110px;
+  text-align: justify;
+  font-family: PingFang-SC-Bold;
+}
+
+.control-label-justify::after {
+  content: "";
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  height: 0;
+}
+.input_view{
+  padding: 8px;
+  background-color: #ffffff;
+  border-radius: 2px;
+  border: solid 1px #c7c7c7!important;
+  color: #333333!important;
+  font-size: 15px!important;
+}
+
+.input_view[readonly]{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+.input_view:disabled{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+</style>

package/src/components/product/ServiceView.vue

@@ -152,31 +152,25 @@
           </div>
         </div>
         <div class="col-sm-12 form-group text-center" style="padding-top:20px">
-            <div class="form-group  col-sm-2 center-block">
-              <label class=" col-sm-6 control-label control-label-justify">所属公司：</label>
-              <div class="col-sm-6">
+            <div class="form-group  col-sm-3 center-block">
+              <label class=" col-sm-4 control-label control-label-justify">所属公司：</label>
+              <div class="col-sm-8">
                 <input class="form-control" type="text" v-model="model.f_filiale" disabled>
               </div>
             </div>
-          <div class="col-sm-1 form-group center-block">
-          </div>
             <div class="col-sm-2 form-group center-block">
               <label class="control-label control-label-justify col-sm-6">部门：</label>
               <div class="col-sm-6">
                 <input type="text" class="form-control" disabled v-model="model.f_parentname"/>
               </div>
             </div>
-          <div class="col-sm-1 form-group center-block">
-          </div>
             <div class="col-sm-2 form-group center-block">
               <label class="control-label control-label-justify col-sm-6">操作人：</label>
               <div class="col-sm-6 ">
                 <input type="text" class="form-control" disabled v-model="model.f_operator"/>
               </div>
             </div>
-          <div class="col-sm-1 form-group center-block">
-          </div>
-            <div class="col-sm-2 form-group center-block">
+            <div class="col-sm-4 form-group center-block">
               <label class="control-label control-label-justify col-sm-6">操作日期：</label>
               <div class="col-sm-6">
                 <input type="text" class="form-control" disabled v-model="model.f_operate_date"/>