apply-clients 5.0.361 → 6.0.3

package/src/components/app_apply/FieldExploration.vue

@@ -5,7 +5,7 @@
         <div class="row auto">
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group mg8">
             <label class="text-justify lb-left" for="f_install_num">实际可安装用户:</label>
-            <input  type="number" class="form-control" id="f_install_num" v-model="model.f_install_num" >
+            <input  type="text" class="form-control" id="f_install_num" v-model="model.f_install_num" >
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" >
             <label class="text-justify lb-left" for="costmatter">缴费户数:</label>
@@ -74,8 +74,6 @@
         </div>
       </div>
     </validator>
-
-
   </div>
 </template>
 <script>

package/src/components/app_apply/PlaceControler.vue

@@ -16,7 +16,7 @@
           </li>
         </div>
         <div class="col-sm-12 col-xs-12 repair-bg"  v-show="routeShow">
-          <route name='apply' :reuse="false"></route>
+          <route name='apply' :reuse="true"></route>
         </div>
         <div>
           <li v-for="(key, value) in tabs" @click="tabSelect(key,$index)" :class="{active1: key === componentName}"
@@ -35,10 +35,9 @@
 <script>
   import ApplyUserInfo from "./ApplyUserInfo";
   import ApplyInfo from "./ApplyInfo";
-  // import FieldExploration from "./FieldExploration";
-  // import Ventilation from "./Ventilation";
-  // import Acceptance from "./Acceptance";
-  import ServiceControl from "./ServiceControl";
+  import FieldExploration from "./FieldExploration";
+  import Ventilation from "./Ventilation";
+  import Acceptance from "./Acceptance";
 
   export default {
     title: '报建代办详情',
@@ -65,7 +64,7 @@
       return {
         routeShow:true,
         number:0,
-        // shupingshow:false,
+        shupingshow:false,
         pipeline: {},
         componentName: 'apply-user-info',
         tabs: {
@@ -75,12 +74,9 @@
           },
           'apply-info': {
             header: '流程信息', class: 'apply-info-class', props: null
-          },
-          'apply-defame-work': {
-            header: null, class: 'apply-info-class', props: null
           }
         },
-        // actName: this.$appdata.getParam('用气类型'),  // 报建app需提取的流程名称
+        actName: this.$appdata.getParam('用气类型'),  // 报建app需提取的流程名称
         faultshow: 8     // 控制 故障汇总 在 菜单里显示与否
       }
     },
@@ -104,7 +100,6 @@
       // 选择tab
       tabSelect (name,number) {
         this.number = number
-        this.tabs[name].props = null
         // 处理关闭/显示 内容
         if(this.componentName == name && !this.routeShow ){
           this.routeShow = true
@@ -114,53 +109,69 @@
           this.routeShow = true
         }
         this.componentName = name
-        console.log('name=>' + name)
-        if(name == 'apply-user-info' || name == 'apply-info'){
-          this.tabs[name].props = {service: this.row, shutype: 'shu'}
-        }else{
-          this.row.defname = this.row.f_order_type
-          // this.row.fields = new Array()
-          // this.row.buttons = new Array()
-          this.tabs[name].props = {selectdata: this.row}
-        }
-        console.log('即将goto=>' + name + ',props:' + JSON.stringify(this.tabs[name].props))
+
         this.$goto(name, this.tabs[name].props, 'apply')
-        // this.shupingshow = true
+        this.shupingshow = true
       },
       setProps() {
         // 给各自组件添加参数
         this.tabs['apply-user-info'].props = {service: this.row, shutype: 'shu'}
-        // this.tabs['apply-info'].props = {service: this.row, shutype: 'shu'}
-        // this.tabs['apply-defame-work'].props = {model: this.row, shutype: 'shu'}
+        this.tabs['apply-info'].props = {service: this.row, shutype: 'shu'}
+        if(this.row.f_order_type.indexOf('勘探') != -1){
+          this.tabs['fieldexploration'].props = {model: this.row, shutype: 'shu'}
+        }
+        if(this.row.f_order_type.indexOf('验收')!= -1){
+          this.tabs['acceptance'].props = {model: this.row, shutype: 'shu'}
+        }
+        if(this.row.f_order_type.indexOf('通气')!= -1){
+          this.tabs['ventilation'].props = {model: this.row, shutype: 'shu'}
+        }
+
+        // pc模拟测试用
+        // this.tabs['fieldexploration'].props = {model: this.row, shutype: 'shu'}
 
+        // 参数设置成功，在转向第一个页签
+        console.log("this.tabs[name].props",this.tabs['apply-user-info'].props)
         this.$goto('apply-user-info', this.tabs[this.componentName].props, 'apply')
       },
     },
     ready () {
-      var keyName = 'apply-defame-work'
-      var valueHeader = this.row.f_order_type
-      var value = {
+      let keyName
+      let valueHeader
+
+      // pc模拟测试用
+      // keyName = 'fieldexploration'
+      // valueHeader = '现场勘探'
+
+      if(this.row.f_order_type.indexOf('勘探') != -1){
+        keyName = 'fieldexploration'
+        valueHeader = '现场勘探'
+      }
+      if(this.row.f_order_type.indexOf('验收') != -1){
+        keyName = 'acceptance'
+        valueHeader = '竣工验收'
+      }
+      if(this.row.f_order_type.indexOf('通气') != -1){
+        keyName = 'ventilation'
+        valueHeader = '通气点火'
+      }
+      let value = {
         header:valueHeader,
-        class: 'apply-info-class',
+        class: 'field-exploration-class',
         props: null
       }
-      this.tabs[keyName] = value
-      console.log( 'this.number=>' + this.number)
-      // this.$set('tabs.' + keyName ,value)
+      this.$set('tabs.' + keyName ,value)
       this.setProps()
     },
     components: {
       'apply-info': ApplyInfo,
       'apply-user-info':ApplyUserInfo,
-      // 'fieldexploration': FieldExploration,
-      // 'acceptance': Acceptance,
-      // 'ventilation':Ventilation
-      'apply-defame-work': ServiceControl
+      'fieldexploration': FieldExploration,
+      'acceptance': Acceptance,
+      'ventilation':Ventilation
+
     },
     events: {
-      'close'() {
-        this.$back()
-      }
     }
   }
 </script>

package/src/components/{product/VueUtils → apply/base}/rightview/InstallCardList2.vue

@@ -4,33 +4,37 @@
       <criteria-paged :model="model" v-ref:paged :pager="false">
         <criteria partial='criteria' @condition-changed='$parent.$parent.selfSearch' v-ref:cri>
           <div novalidate class="flex-row select-overspread" partial style="white-space: nowarp;">
-            <div class="form-group col-sm-5">
-              <!-- <label>用户编号:</label> -->
-              <input  type="text" class="form-control" v-model="model.f_user_name" placeholder='联系人' condition="f_user_name like '%{}%'">
-            </div>
-            <div class="form-group col-sm-5">
-              <!-- <label>操作类型:</label> -->
               <div class="form-group">
                 <!-- <label>用户编号:</label> -->
-                <input  type="text" class="form-control " v-model="model.f_phone" placeholder='电话号码' condition="f_phone like '%{}%'">
+                <input  type="text" class="form-control width-100" v-model="model.f_userinfo_id" placeholder='报建编号' condition="f_userinfo_id = '{}'">
+              </div>
+              <div class="form-group" style="flex: 1;">
+                <!-- <label>操作类型:</label> -->
+                <v-select id="f_paytype"
+                v-model="model.f_operat_type"
+                placeholder='操作类型'
+                :value.sync="model.f_operat_type"
+                :options='$parent.$parent.$parent.operationtypes'
+                condition="f_operat_type = '{}'"
+                close-on-select ></v-select>
+                <partial name="cardcriteria"></partial>
+              </div>
+              <!-- <div class="form-group">
+                <partial name="cardcriteria"></partial>
+              </div> -->
+              <div class="form-group">
+                  <button class="btn btn-success width-100" @click="search()" id=base-rightVie-cardLis-查询>查询</button>
               </div>
-            </div>
-            <!-- <div class="form-group">
-              <partial name="cardcriteria"></partial>
-            </div> -->
-            <div class="form-group col-sm-2">
-              <button class="btn btn-success width-100" @click="search()" id=base-rightVie-cardLis-查询>查询</button>
-            </div>
 
           </div>
         </criteria>
         <accordion :one-at-atime="true" type="info" partial="list">
           <panel type="info" v-for="row in model.rows" :is-open="true" :is-click="false" v-show="row.type==='终止报建'">
-            <span class="panel-title row" slot="header" @click="$parent.$parent.$parent.selected(row)" style="cursor: pointer;">
+            <span class="panel-title row" slot="header" style="cursor: pointer;">
               <div class="col-sm-11">
                 <div class="row">
-                  <div class="col-sm-4">{{row.f_apply_num}}</div>
-                  <div class="col-sm-4"></div>
+                  <strong class="col-sm-4">{{row.f_userinfo_id}}</strong>
+                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
                   <span class="col-sm-4">{{row.type}}</span>
                 </div>
               </div>
@@ -41,13 +45,18 @@
                     <span class="glyphicon glyphicon-th-list"></span>
                   </button>
                   <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right" style=" min-width: 60px;">
+                    <!--<li v-if="row.type === '机表收费' || row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' || row.type === '换表'">-->
+                      <!--<a href="#" @click.stop="$parent.$parent.$parent.operate('票据补打', row)">票据补打</a>-->
+                    <!--</li>-->
+                    <!-- <li v-if="row.state === 1 &&  row.type !== '档案变更' && row.type !== '新增户档案' && row.type !== '银行代扣' && row.type !== '发卡售气' && row.type !== '卡表收费'&& row.type !== '补气'"> -->
                     <li v-if="row.type === '终止报建'">
                       <a href="#" @click.stop="$parent.$parent.$parent.operate('撤销', row)">撤销</a>
                     </li>
                   </ul>
                 </dropdown>
               </div>
-            </span>
+
+            <!--</span>-->
             <div class="panel-body" v-if="$parent.$parent.$parent.isSelected(row)">
               <!--<build-apply-detail v-if="row.type === '报建收费'" :data="row"></build-apply-detail>-->
               <!--<change-apply-detail v-if="row.type === '报建费用变更'" :data="row"></change-apply-detail>-->
@@ -64,11 +73,11 @@
       </criteria-paged>
     </partial-view>
   </div>
-</template>
-<script>
+  </template>
+  <script>
   /**
-   *操作记录信息
-   */
+  *操作记录信息
+  */
   import { PagedList } from 'vue-client'
   import co from 'co'
   import AppData from '../../../../stores/AppData'
@@ -86,7 +95,7 @@
       return {
         operationtypes: this.$appdata.getParam('报建业务类型'),
         model: new PagedList(`${this.sqlurl}`, 9999,
-          {items: '"' + this.items + '"', tablename: '"' + this.tablename + '"', orderitem: '"' + this.orderitem + '"'}),
+         {condition:'"' +'f_operator= \''+this.$login.f.name+'\''+ '"',items: '"' + this.items + '"', tablename: '"' + this.tablename + '"', orderitem: '"' + this.orderitem + '"'}),
         show: false,
         asideTitle: '用户操作',
         row: Object,
@@ -96,7 +105,7 @@
     props: {
       sqlurl: {
         type: String,
-        default: 'rs/sql/getinstallrecord'
+          default: 'rs/sql/getinstallrecord'
       },
       items: {
         type: String,
@@ -148,7 +157,7 @@
         let condition = '1=1'
         // this.$refs.paged.$refs.cri.search()
         if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
-          condition += ` and f_filiale = '${this.$login.f.f_fengongsi}'`
+          condition += `and f_filiale = '${this.$login.f.f_fengongsi}'`
         }
         this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
           if (a.data.length === 0) {
@@ -167,7 +176,7 @@
       operate (title, row) {
         if (title === '票据补打' && (row.type === '机表收费' || row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气')) {
           this.$resetpost('rs/sql/singleTable_OrderBy', {data: {orderitem: 'id', items: '*',
-              tablename: 't_sellinggas', condition: 'id = ' + row.id}}).then((res) => {
+          tablename: 't_sellinggas', condition: 'id = ' + row.id}}).then((res) => {
             row = Object.assign({}, row, res.data[0])
             this.$dispatch('list-select-oper', `${row.type}票据补打`, 'reissue-bill', row)
           }).catch((error) => {
@@ -179,7 +188,7 @@
           })
         } else if (title === '票据补打' && row.type === '其他收费') {
           this.$resetpost('rs/sql/singleTable_OrderBy', {data: {orderitem: 'id', items: '*',
-              tablename: 't_othercharge', condition: 'id = ' + row.id}}).then((res) => {
+          tablename: 't_othercharge', condition: 'id = ' + row.id}}).then((res) => {
             if (res.data[0].f_charge_type === '国税发票') {
               row = Object.assign({}, row, res.data[0])
               this.$dispatch('list-select-oper', `${row.type}票据补打`, 'reissue-other-bill', row)
@@ -196,7 +205,7 @@
           })
         } else if (title === '票据补打' && row.type === '换表') {
           this.$resetpost('rs/sql/singleTable_OrderBy', {data: {orderitem: 'id', items: '*',
-              tablename: 't_changemeter', condition: 'id = ' + row.id}}).then((res) => {
+          tablename: 't_changemeter', condition: 'id = ' + row.id}}).then((res) => {
             row = Object.assign({}, row, res.data[0])
             this.$dispatch('list-select-oper', `${row.type}票据补打`, 'reissue-change-meter-bill', row)
           }).catch((error) => {
@@ -256,4 +265,4 @@
       // }
     },
   }
-</script>
+  </script>

package/src/components/{product/VueUtils → apply/base}/rightview/carddetail/ReduceFeeDetail2.vue

@@ -1,77 +1,77 @@
-<template>
-  <div class="auto">
-    <partial-view v-ref:pv>
-      <!-- <div class="row"> -->
-        <!-- <label class = " col-sm-3 control-label">用户姓名:</label> -->
-        <!-- <span style="padding:0" class = " col-sm-3">{{model[0].f_user_name}}</span> -->
-        <!-- <label class = "col-sm-3 control-label">操作人:</label>
-        <span class = "col-sm-3">{{model.f_operator}}</span> -->
-      <!-- </div> -->
-      <table class="table table-bordered table-condensed self-table" id="table" >
-        <!-- <tr>
-           <td><b>享受减免账户</b></td>
-           <td>{{data.f_user_name}}</td>
-        </tr> -->
-          <tr>
-             <td><b>减免科目</b></td>
-             <td>{{model.f_subject}}</td>
-          </tr>
-          <tr>
-            <td><b>减免金额</b></td>
-            <td>{{model.f_fee}}</td>
-          </tr>
-          <tr>
-            <td><b>审核领导</b></td>
-            <td>{{model.f_leader}}</td>
-          </tr>
-          <tr>
-            <td><b>操作日期</b></td>
-            <td>{{model.f_date}}</td>
-          </tr>
-      </table>
-
-    </partial-view>
-  </div>
-</template>
-
-<script>
-import Table from '../../../../Table'
-export default {
-  title: '报建费用减免',
-  props: ['data'],
-  data () {
-    return {
-      model: {}
-    }
-  },
-  ready () {
-    console.log('dadddddddddddddddddddddreduce', this.data)
-    let sql = 'singleTable_OrderBy'
-    let condition = {
-      items: '*',
-      tablename: 't_costreduction',
-      condition: 'id = ' + this.data.id,
-      orderitem: 'id'
-    }
-    this.$info(`加载数据中..., sql:${sql}`)
-    this.$refs.pv.load('rs/sql/singleTable', {data:condition}).then((a) => {
-      this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
-      this.model = a.data
-      console.log('1111111model', this.model)
-      console.log('1111111data', a.data)
-    }).catch((error) => {
-      if (error.status) {
-        this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
-        return
-      }
-      throw error
-    })
-  },
-  methods: {
-    // 获取表中字段对应的中文名
-    getValue (key) {
-      return Table.data[key]
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto">
+    <partial-view v-ref:pv>
+      <!-- <div class="row"> -->
+        <!-- <label class = " col-sm-3 control-label">用户姓名:</label> -->
+        <!-- <span style="padding:0" class = " col-sm-3">{{model[0].f_user_name}}</span> -->
+        <!-- <label class = "col-sm-3 control-label">操作人:</label>
+        <span class = "col-sm-3">{{model.f_operator}}</span> -->
+      <!-- </div> -->
+      <table class="table table-bordered table-condensed self-table" id="table" >
+        <!-- <tr>
+           <td><b>享受减免账户</b></td>
+           <td>{{data.f_user_name}}</td>
+        </tr> -->
+          <tr>
+             <td><b>减免科目</b></td>
+             <td>{{model.f_subject}}</td>
+          </tr>
+          <tr>
+            <td><b>减免金额</b></td>
+            <td>{{model.f_fee}}</td>
+          </tr>
+          <tr>
+            <td><b>审核领导</b></td>
+            <td>{{model.f_leader}}</td>
+          </tr>
+          <tr>
+            <td><b>操作日期</b></td>
+            <td>{{model.f_date}}</td>
+          </tr>
+      </table>
+
+    </partial-view>
+  </div>
+</template>
+
+<script>
+import Table from '../../../../Table'
+export default {
+  title: '报建费用减免',
+  props: ['data'],
+  data () {
+    return {
+      model: {}
+    }
+  },
+  ready () {
+    console.log('dadddddddddddddddddddddreduce',  this.data)
+    let sql = 'singleTable_OrderBy'
+    let condition = {
+      items: '*',
+      tablename: 't_costreduction',
+      condition: 'id = ' + this.data.id,
+      orderitem: 'id'
+    }
+    this.$info(`加载数据中..., sql:${sql}`)
+    this.$refs.pv.load('rs/sql/singleTable', {data:condition}).then((a) => {
+      this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
+      this.model = a.data
+      console.log('1111111model', this.model)
+      console.log('1111111data', a.data)
+    }).catch((error) => {
+      if (error.status) {
+        this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
+        return
+      }
+      throw error
+    })
+  },
+  methods: {
+    // 获取表中字段对应的中文名
+    getValue (key) {
+      return Table.data[key]
+    }
+  }
+}
+</script>

package/src/components/{product/VueUtils → apply/base}/rightview/carddetail/StopApplyDetail2.vue

@@ -49,7 +49,7 @@ export default {
       orderitem: 'id'
     }
     this.$info(`加载数据中..., sql:${sql}`)
-    this.$refs.pv.load('rs/logic/apply_getOneData', {data: {sql: sql, params: condition}}).then((a) => {
+    this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: condition}}).then((a) => {
       this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
       this.model = a.data
     }).catch((error) => {