apply-clients 3.5.6-24 → 3.5.6-25

package/build/dev-server.js

@@ -8,8 +8,8 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://www.hnczjhgas.com:31467'
-var applyinstall = 'http://www.hnczjhgas.com:31467'
+var ldap = 'http://125.71.238.50:30789'
+var applyinstall = 'http://125.71.238.50:30789'
 
 var proxyTable = {
   '/api': {

package/package.json

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

package/src/filiale/yangchunboneng/pc/SupervisoryList.vue

@@ -100,7 +100,7 @@
                 :options='$parent.$parent.applytype'
                 class="select select_list"
                 :multiple="true"
-                ></v-select>
+              ></v-select>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">办理环节：</label>
@@ -177,42 +177,42 @@
               <input type="text" style="width:60%" class="input_search" v-model="model.f_construction_unit"
                      v-on:keyup.enter="$parent.$parent.search()" condition="f_construction_unit like '%{}%'" placeholder='施工单位'>
             </div>
-<!--            <div class="form-group col-sm-3">-->
-<!--              <label class="font_normal_body">表&emsp;&emsp;号：</label>-->
-<!--              <input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"-->
-<!--                     v-on:keyup.enter="$parent.$parent.search()"-->
-<!--                     condition="meternumber like '%{}%'">-->
-<!--            </div>-->
-<!--            <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.lyr"-->
-<!--                     v-on:keyup.enter="$parent.$parent.search()"-->
-<!--                     condition="lyr like '%{}%'">-->
-<!--            </div>-->
-<!--            <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.fyr"-->
-<!--                     v-on:keyup.enter="$parent.$parent.search()"-->
-<!--                     condition="fyr like '%{}%'">-->
-<!--            </div>-->
+            <!--            <div class="form-group col-sm-3">-->
+            <!--              <label class="font_normal_body">表&emsp;&emsp;号：</label>-->
+            <!--              <input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"-->
+            <!--                     v-on:keyup.enter="$parent.$parent.search()"-->
+            <!--                     condition="meternumber like '%{}%'">-->
+            <!--            </div>-->
+            <!--            <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.lyr"-->
+            <!--                     v-on:keyup.enter="$parent.$parent.search()"-->
+            <!--                     condition="lyr like '%{}%'">-->
+            <!--            </div>-->
+            <!--            <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.fyr"-->
+            <!--                     v-on:keyup.enter="$parent.$parent.search()"-->
+            <!--                     condition="fyr like '%{}%'">-->
+            <!--            </div>-->
             <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_operator"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="u.f_operator like '%{}%'">
             </div>
-<!--            <div class="form-group col-sm-3">-->
-<!--              <label class="font_normal_body">领用状态：</label>-->
-<!--              <v-select-->
-<!--                v-model="model.frstate"-->
-<!--                placeholder='流程状态'-->
-<!--                condition="frstate = '{}'"-->
-<!--                :value.sync="model.frstate"-->
-<!--                :options='$parent.$parent.lyStates'-->
-<!--                class="select select_list"-->
-<!--                :value-single="true"-->
-<!--                close-on-select ></v-select>-->
-<!--            </div>-->
+            <!--            <div class="form-group col-sm-3">-->
+            <!--              <label class="font_normal_body">领用状态：</label>-->
+            <!--              <v-select-->
+            <!--                v-model="model.frstate"-->
+            <!--                placeholder='流程状态'-->
+            <!--                condition="frstate = '{}'"-->
+            <!--                :value.sync="model.frstate"-->
+            <!--                :options='$parent.$parent.lyStates'-->
+            <!--                class="select select_list"-->
+            <!--                :value-single="true"-->
+            <!--                close-on-select ></v-select>-->
+            <!--            </div>-->
             <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">完工时间：</label>
               <datepicker id="startDate" placeholder="开始日期"
@@ -347,7 +347,6 @@
                           condition="u.f_contract_date <= '{}'">
               </datepicker>
             </div>
-            <div class="form-group col-sm-3">
           </div>
         </div>
       </criteria>
@@ -381,8 +380,8 @@
             <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>
+                        <th style="white-space: nowrap;">热水器品牌</th>-->
             <th style="white-space: nowrap;">缴费金额</th>
             <th style="white-space: nowrap;">验收时间</th>
             <th style="white-space: nowrap;">开工时间</th>
@@ -475,12 +474,12 @@
             <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_construction_date}}</nobr>
             </td>
-<!--            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row['热水器']}}</nobr>
-            </td>
-            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row['灶具']}}</nobr>
-            </td>-->
+            <!--            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                          <nobr>{{row['热水器']}}</nobr>
+                        </td>
+                        <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                          <nobr>{{row['灶具']}}</nobr>
+                        </td>-->
             <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_cumulative_payment_money}}</nobr>
             </td>
@@ -509,171 +508,172 @@
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
-  import {isEmpty} from '../../../components/Util'
-  export default {
-    title: '勘探详情',
-    props: ['showData'],
-    data () {
-      return {
-        model: new PagedList('rs/sql/supervisory', 20, {
-          data: {
-            orgid: this.$login.f.orgid
-          }
-        }),
-        orgid:'',
-        curorgid: [this.$login.f.orgid],
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        usertype: [{label: '全部', value: ''}, {label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
-        defnames: [{label: '全部', value: ''},...this.$appdata.getParam('办理环节')], // 流程节点
-        applyNatures: [{label: '全部', value: ''},...this.$appdata.getParam('报建性质')], // 报建性质
-        criteriaShow: false,
-        satisfied: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建服务评价')],
-        subStates: [
-          {label: '全部', value: ''},
-          {label: '新增', value: '新增'},
-          {label: '暂停', value: '暂停'},
-          {label: '终止', value: '终止'},
-          {label: '完工', value: '完工'},
-          {label: '正在进行', value: '正在进行'}
-        ], // 流程状态
-        lyStates: [
-          {label: '全部', value: ''},
-          {label: '已领', value: '已领'},
-          {label: '未领', value: '未领'}
-
-        ],
-        // 流程状态
-        getfield: {
-          'f_apply_num': '工程编号',
-          'f_userinfo_code': '用户编号',
-          'f_user_name': '客户名称',
-          'f_user_type': '客户类型',
-          'f_contract_number': '合同编号',
-          'f_phone': '电话',
-          'f_address': '地址',
-          'f_apply_source': '来源',
-          'f_apply_type': '报建类型',
-          'f_apply_nature': '报建性质',
-          'f_cumulative_payment_money': '缴费金额',
-          'defname': '办理环节',
-          'f_sub_state': '流程状态',
-          'f_apply_date': '报建日期',
-          'f_finish_date': '完工日期',
-          'f_shenqing_person': '通气申请人',
-          'f_hetong_person': '合同审批人',
-          'f_tongqi_person': '通气施工人',
-          'f_fangan_person': '方案审批人',
-          'f_gogncheng_person': '工程审批人',
-          'f_apply_remarks': '报建申请备注',
-          'f_yanshou_person': '验收审批人',
-          'f_install_project': '安装项目',
-          'f_construction_date': '施工时间',
-          'f_construction_remarks': '施工备注',
-          'f_completion_time': '开工时间',
-          'f_budget_people':'施工人',
-          'f_acceptance_time':'验收时间',
-          'f_gongcheng_tijiao':'派工时间',
-          'f_user_appraise':'服务评价',
-          'f_operator':'发起人',
-          'f_contract_date':'合同签订时间'
+import {PagedList} from 'vue-client'
+import {isEmpty} from '../../../components/Util'
+export default {
+  title: '勘探详情',
+  props: ['showData'],
+  data () {
+    return {
+      model: new PagedList('rs/sql/supervisory', 20, {
+        data: {
+          orgid: this.$login.f.orgid
         }
+      }),
+      orgid:'',
+      curorgid: [this.$login.f.orgid],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      usertype: [{label: '全部', value: ''}, {label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
+      defnames: [{label: '全部', value: ''},...this.$appdata.getParam('办理环节')], // 流程节点
+      applyNatures: [{label: '全部', value: ''},...this.$appdata.getParam('报建性质')], // 报建性质
+      criteriaShow: false,
+      satisfied: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建服务评价')],
+      subStates: [
+        {label: '全部', value: ''},
+        {label: '新增', value: '新增'},
+        {label: '暂停', value: '暂停'},
+        {label: '终止', value: '终止'},
+        {label: '完工', value: '完工'},
+        {label: '正在进行', value: '正在进行'}
+      ], // 流程状态
+      lyStates: [
+        {label: '全部', value: ''},
+        {label: '已领', value: '已领'},
+        {label: '未领', value: '未领'}
+
+      ],
+      // 流程状态
+      getfield: {
+        'f_apply_num': '工程编号',
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '客户名称',
+        'f_user_type': '客户类型',
+        'f_contract_number': '合同编号',
+        'f_phone': '电话',
+        'f_address': '地址',
+        'f_apply_source': '来源',
+        'f_apply_type': '报建类型',
+        'f_apply_nature': '报建性质',
+        'f_cumulative_payment_money': '缴费金额',
+        'defname': '办理环节',
+        'f_sub_state': '流程状态',
+        'f_apply_date': '报建日期',
+        'f_finish_date': '完工日期',
+        'f_shenqing_person': '通气申请人',
+        'f_hetong_person': '合同审批人',
+        'f_tongqi_person': '通气施工人',
+        'f_fangan_person': '方案审批人',
+        'f_gogncheng_person': '工程审批人',
+        'f_apply_remarks': '报建申请备注',
+        'f_yanshou_person': '验收审批人',
+        'f_install_project': '安装项目',
+        'f_construction_date': '施工时间',
+        'f_construction_remarks': '施工备注',
+        'f_completion_time': '开工时间',
+        'f_budget_people':'施工人',
+        'f_acceptance_time':'验收时间',
+        'f_gongcheng_tijiao':'派工时间',
+        'f_user_appraise':'服务评价',
+        'f_operator':'发起人',
+        'f_contract_date':'合同签订时间',
+
       }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  events: {
+  },
+  methods: {
+    loadPage () {
+      this.$dispatch('loadPage')
     },
-    ready () {
-      // 调用查询
-      this.search()
+    // 查询
+    search () {
+      this.$dispatch('search')
     },
-    events: {
+    check (val) {
+      this.$dispatch('apply', val)
     },
-    methods: {
-      loadPage () {
-        this.$dispatch('loadPage')
-      },
-      // 查询
-      search () {
-        this.$dispatch('search')
-      },
-      check (val) {
-        this.$dispatch('apply', val)
-      },
-      async applyTypeChange () {
-        //判断this.$refs.cp.$refs.cri.model.f_apply_type是不是数组
-        if (Array.isArray(this.$refs.cp.$refs.cri.model.f_apply_type)) {
-          if(this.$refs.cp.$refs.cri.model.f_apply_type.length>0){
-            for (let i = 0; i < this.$refs.cp.$refs.cri.model.f_apply_type.length; i++) {
-              let res = await this.$resetpost('rs/logic/getDefnameByType',
-                { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type[i] },
-                {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
-              )
-              if (!isEmpty(res.data)) {
-                const newDefnames = [{ label: '全部', value: '' }, ...res.data];
-                const newApplyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type[i]}性质`))
-                  ? [{ label: '全部', value: '' }]
-                  : [{ label: '全部', value: '' }, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type[i]}性质`)];
-                // 检查并追加 defnames
-                newDefnames.forEach(item => {
-                  if (!this.defnames.some(defname => defname.value === item.value)) {
-                    this.defnames.push(item);
-                  }
-                });
-                // 检查并追加 applyNatures
-                newApplyNatures.forEach(item => {
-                  if (!this.applyNatures.some(applyNature => applyNature.value === item.value)) {
-                    this.applyNatures.push(item);
-                  }
-                });
-              }
-            }
-          }
-        }else{
-          if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+    async applyTypeChange () {
+      //判断this.$refs.cp.$refs.cri.model.f_apply_type是不是数组
+      if (Array.isArray(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+        if(this.$refs.cp.$refs.cri.model.f_apply_type.length>0){
+          for (let i = 0; i < this.$refs.cp.$refs.cri.model.f_apply_type.length; i++) {
             let res = await this.$resetpost('rs/logic/getDefnameByType',
-              { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
+              { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type[i] },
               {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
             )
+            if (!isEmpty(res.data)) {
+              const newDefnames = [{ label: '全部', value: '' }, ...res.data];
+              const newApplyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type[i]}性质`))
+                ? [{ label: '全部', value: '' }]
+                : [{ label: '全部', value: '' }, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type[i]}性质`)];
+              // 检查并追加 defnames
+              newDefnames.forEach(item => {
+                if (!this.defnames.some(defname => defname.value === item.value)) {
+                  this.defnames.push(item);
+                }
+              });
+              // 检查并追加 applyNatures
+              newApplyNatures.forEach(item => {
+                if (!this.applyNatures.some(applyNature => applyNature.value === item.value)) {
+                  this.applyNatures.push(item);
+                }
+              });
+            }
+          }
+        }
+      }else{
+        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          let res = await this.$resetpost('rs/logic/getDefnameByType',
+            { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
+            {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
+          )
 
-            this.defnames = [{label: '全部', value: ''}, ...res.data]
+          this.defnames = [{label: '全部', value: ''}, ...res.data]
 
-            this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
-          } else {
-            this.defnames = [{label: '全部', value: ''}]
+          this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
+        } else {
+          this.defnames = [{label: '全部', value: ''}]
 
-            this.applyNatures = [{label: '全部', value: ''}]
-          }
-        }
-      },
-      clear () {
-        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          if (Array.isArray(this.$refs.cp.$refs.cri.model[key])) {
-            this.$refs.cp.$refs.cri.model[key] = [];
-          } else {
-            this.$refs.cp.$refs.cri.model[key] = null;
-          }
-        })
-      },
-      getorg (val) {
-        if (val.length <= 0) {
-          return
+          this.applyNatures = [{label: '全部', value: ''}]
         }
-        this.model.params.data.orgid = val[0]
-        this.orgid=  val[0]
       }
     },
-    computed: {
-      getCondition () {
-        return {
-          condition: this.model.condition,
-          data: {
-            orgid: this.orgid
-          }
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        if (Array.isArray(this.$refs.cp.$refs.cri.model[key])) {
+          this.$refs.cp.$refs.cri.model[key] = [];
+        } else {
+          this.$refs.cp.$refs.cri.model[key] = null;
+        }
+      })
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.model.params.data.orgid = val[0]
+      this.orgid=  val[0]
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.model.condition,
+        data: {
+          orgid: this.orgid
         }
-      },
-      projectImport () {
-        return this.$login.r.includes('流程监控-导出')
       }
+    },
+    projectImport () {
+      return this.$login.r.includes('流程监控-导出')
     }
   }
+}
 </script>
 <style scoped>
 </style>

package/src/main.js

@@ -9,7 +9,7 @@ import {material} from 'material-client'
 import apply from './apply'
 
 all()
-apply('jinhuang')
+apply('yangchunboneng')
 ldap()
 sale()
 material()