apply-clients 7.1.36-yuchuan-41 → 7.1.36-yuchuan-42

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

@@ -42,7 +42,7 @@
             ></v-select>
           </div>
           <div class="col-sm-6" :class="[!model.f_idnumber ? 'has-error' : '']">
-            <label class="font_normal_body">{{ model.f_credentials.includes('统一社会信用代码') ? '统一社会信用代码' : '证件号码' }}</label>
+            <label class="font_normal_body">证件号码</label>
             <input type="text" v-model="model.f_idnumber" style="width: 60%" class="input_search">
           </div>
         </div>
@@ -126,19 +126,21 @@
             <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: 60%" class="input_search">
           </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_apply_code ? 'has-error' : '']">
+            <label class="font_normal_body">项目编号</label>
+            <input type="text" v-model="model.f_apply_code" 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">
@@ -234,7 +236,7 @@
 export default {
   title: '报警处置',
 
-  data () {
+  data() {
     return {
       // [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
       landMethods: [...this.$appdata.getParam('土地获取方式') ? this.$appdata.getParam('土地获取方式') : []],
@@ -253,7 +255,7 @@ export default {
     }
   },
   methods: {
-    isFormComplete () {
+    isFormComplete() {
       const model = this.model
       return (
         model.f_user_name && model.f_user_type && model.f_contact && model.f_phone && model.f_credentials &&
@@ -264,13 +266,13 @@ export default {
         model.f_national_standard_industry && model.f_open_date && model.f_success_date && model.f_construction_content
       )
     },
-    cancel () {
+    cancel() {
       this.$dispatch('close')
     },
-    addressValid (val) {
+    addressValid(val) {
       console.log(val)
     },
-    save (status) {
+    save(status) {
       this.model.f_state = status
       this.$resetpost('/third/rs/logic/gjPushData', {data: this.model}).then((res) => {
         console.log('this.model', this.model)

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

@@ -1,91 +1,91 @@
-<template>
-  <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"  v-show="showItem">
-      <gongjian-apply-dispose :recordlist="recordlist" :model="model" :oldmodel="oldmodel"
-                               :f_distribution_state="f_distribution_state" :row="row" :rows'榆林.'"rowsdata1"
-                               :warehousename="warehousename"
-      ></gongjian-apply-dispose>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '政府报建',
-  components: {},
-  data() {
-    return {
-      f_alarmId: '',
-      row: {},
-      model: {},
-      oldmodel: {},
-      showItem: false,
-      stepControl: true,
-
-      // 分公司id串
-      width: '100%',
-      f_filialeids: "榆林."+this.$login.f.orgs,
-      areaShow: false,
-      areatype: '小区',
-      arearow: {},
-      style: 'col-sm-2'
-    }
-  },
-  methods: {
-    selected(obj) {
-      this.style = 'col-sm-3 '
-      if (obj.val && obj.val.id) {
-        console.log('对比分公司', obj.val.f_filialeid, this.f_filialeids)
-        if (obj.val.f_filialeid !== this.f_filialeids) {
-          this.refresh()
-          return
-        }
-        this.areaShow = true
-        this.$refs.addareamsg.cleardara()
-        this.$refs.addareamsg.operation = 'modify'
-        this.$refs.addareamsg.areatype = '小区'
-        this.$refs.addareamsg.areamodel = Object.assign({}, obj.val)
-        if (obj.val.f_slice_area && obj.val.f_area_code) {
-          this.$refs.addareamsg.areamodel.slice_area = [{
-            name: this.$refs.addareamsg.areamodel.f_slice_area,
-            code: this.$refs.addareamsg.areamodel.f_area_code
-          }]
-        }
-        this.$refs.addareamsg.initdata(obj.val)
-      }
-    },
-    add (a) {
-      console.log('新增')
-      this.showItem = true
-      this.model = {}
-      this.oldmodel = {}
-    },
-    refresh() {
-      this.areaShow = false
-      this.showItem = false
-      this.$refs.arealist.$refs.paged.$refs.cri.search()
-    },
-    idsearch(row) {
-      this.showItem = true
-      this.model = JSON.parse(JSON.stringify(row.val))
-      this.oldmodel = JSON.parse(JSON.stringify(row.val))
-    },
-    getAlarmData () {
-      let data = {}
-    }
-  },
-  events: {
-    'close'() {
-      this.showItem = false
-      this.$refs.stocklist.search()
-      console.log('this.$refs', this.$refs)
-      console.log('showitem', this.showItem)
-    },
-  }
-}
-</script>
-
+<template>
+  <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"  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>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '政府报建',
+  components: {},
+  data() {
+    return {
+      f_alarmId: '',
+      row: {},
+      model: {},
+      oldmodel: {},
+      showItem: false,
+      stepControl: true,
+
+      // 分公司id串
+      width: '100%',
+      f_filialeids: "榆林."+this.$login.f.orgs,
+      areaShow: false,
+      areatype: '小区',
+      arearow: {},
+      style: 'col-sm-2'
+    }
+  },
+  methods: {
+    selected(obj) {
+      this.style = 'col-sm-3 '
+      if (obj.val && obj.val.id) {
+        console.log('对比分公司', obj.val.f_filialeid, this.f_filialeids)
+        if (obj.val.f_filialeid !== this.f_filialeids) {
+          this.refresh()
+          return
+        }
+        this.areaShow = true
+        this.$refs.addareamsg.cleardara()
+        this.$refs.addareamsg.operation = 'modify'
+        this.$refs.addareamsg.areatype = '小区'
+        this.$refs.addareamsg.areamodel = Object.assign({}, obj.val)
+        if (obj.val.f_slice_area && obj.val.f_area_code) {
+          this.$refs.addareamsg.areamodel.slice_area = [{
+            name: this.$refs.addareamsg.areamodel.f_slice_area,
+            code: this.$refs.addareamsg.areamodel.f_area_code
+          }]
+        }
+        this.$refs.addareamsg.initdata(obj.val)
+      }
+    },
+    add (a) {
+      console.log('新增')
+      this.showItem = true
+      this.model = {}
+      this.oldmodel = {}
+    },
+    refresh() {
+      this.areaShow = false
+      this.showItem = false
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+    },
+    idsearch(row) {
+      this.showItem = true
+      this.model = JSON.parse(JSON.stringify(row.val))
+      this.oldmodel = JSON.parse(JSON.stringify(row.val))
+    },
+    getAlarmData () {
+      let data = {}
+    }
+  },
+  events: {
+    'close'() {
+      this.showItem = false
+      this.$refs.stocklist.search()
+      console.log('this.$refs', this.$refs)
+      console.log('showitem', this.showItem)
+    },
+  }
+}
+</script>
+

package/src/components/product/Ignition/IgnitionDispatch.vue

@@ -1,90 +1,90 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'" v-if="!showtotal">
-        <ignition-list v-ref:query :show-data="showData"></ignition-list>
-      </div>
-      <div v-if="showtotal">
-        <div class="top">
-          <ignition-list-manage :show-data="selectdata" :node-snapshot="true"></ignition-list-manage>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</template>
-<script>
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '点火派单列表',
-  data () {
-    return {
-      showtotal: false, // 控制详细信息显示
-      showData: true,
-      selectdata: {},
-      xmlname: '' // 配置文件名称
-    }
-  },
-  created () {
-  },
-  methods: {
-    // 获取页面配置json文件
-    async loadName () {
-      let http = new HttpResetClass()
-      let data = {
-        workname: this.selectdata.processname
-      }
-      let res= await http.load('POST', 'rs/logic/ApplyGetConfigs', {
-        data
-      }, {resolveMsg: null, rejectMsg: null})
-
-        Vue.prototype.$workflow_vue = res.data
-    }
-  },
-  events: {
-    'onMessage' (data) {
-      console.log('接收消息')
-      console.log(data)
-      if (data.type === 'apply-task') {
-        this.$refs.queryuser.$refs.cp.$refs.cri.search()
-      }
-    },
-    async 'apply' (val) {
-      this.selectdata = val
-      this.showtotal = false
-
-      // 获取配置文件
-      await this.loadName()
-
-      this.$refs.query.$refs.cp.pager = false
-      this.showData = false
-
-      this.showtotal = true
-    },
-    'search' () {
-      // 关闭详细
-      this.showtotal = false
-      // 显示列表数据
-      this.showData = true
-      // 显示分页
-      this.$refs.query.$refs.cp.pager = true
-      // 调用查询
-      this.$refs.query.$refs.cp.$refs.cri.search()
-    },
-    'loadPage' () {
-      // 关闭详细
-      this.showtotal = false
-      // 显示列表数据
-      this.showData = true
-      // 显示分页
-      this.$refs.query.$refs.cp.pager = true
-      // 调用查询
-      this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
-    }
-  },
-
-  watch: {
-  }
-}
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'" v-if="!showtotal">
+        <ignition-list v-ref:query :show-data="showData"></ignition-list>
+      </div>
+      <div v-if="showtotal">
+        <div class="top">
+          <ignition-list-manage :show-data="selectdata" :node-snapshot="true"></ignition-list-manage>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '点火派单列表',
+  data () {
+    return {
+      showtotal: false, // 控制详细信息显示
+      showData: true,
+      selectdata: {},
+      xmlname: '' // 配置文件名称
+    }
+  },
+  created () {
+  },
+  methods: {
+    // 获取页面配置json文件
+    async loadName () {
+      let http = new HttpResetClass()
+      let data = {
+        workname: this.selectdata.processname
+      }
+      let res= await http.load('POST', 'rs/logic/ApplyGetConfigs', {
+        data
+      }, {resolveMsg: null, rejectMsg: null})
+
+        Vue.prototype.$workflow_vue = res.data
+    }
+  },
+  events: {
+    'onMessage' (data) {
+      console.log('接收消息')
+      console.log(data)
+      if (data.type === 'apply-task') {
+        this.$refs.queryuser.$refs.cp.$refs.cri.search()
+      }
+    },
+    async 'apply' (val) {
+      this.selectdata = val
+      this.showtotal = false
+
+      // 获取配置文件
+      await this.loadName()
+
+      this.$refs.query.$refs.cp.pager = false
+      this.showData = false
+
+      this.showtotal = true
+    },
+    'search' () {
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData = true
+      // 显示分页
+      this.$refs.query.$refs.cp.pager = true
+      // 调用查询
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    'loadPage' () {
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData = true
+      // 显示分页
+      this.$refs.query.$refs.cp.pager = true
+      // 调用查询
+      this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+    }
+  },
+
+  watch: {
+  }
+}
+</script>