apply-clients 4.1.27-weinan → 4.1.29-weinan

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

@@ -117,7 +117,14 @@
         </div>
 
         <div v-for="(i, item) in userinfo.devices" class="form-group col-sm-12 panel panel-info">
-          <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">设备{{$index+1}}信息</div>
+          <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-sm-6 text-left" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</div>
+            <div class="col-sm-6 text-right"><button
+              class="button_delete button_spacing"
+              v-if="!item.f_userfiles_id"
+              @click.prevent="deleteUserFile(i)"
+            >删除</button></div>
+          </div>
           <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">设备类型：</label>
             <div class="col-sm-8">
@@ -605,6 +612,10 @@ export default {
     this.search()
   },
   methods: {
+    // 删除未保存的表具
+    async deleteUserFile (index) {
+      this.userinfo.devices.splice(index, 1)
+    },
     // 追加表具
     addUserFile() {
       this.userinfo.devices.push({})

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -1,194 +1,200 @@
-<template>
-  <div class="auto clearfix">
-    <show-back-reason :selectdata="data"></show-back-reason>
-  </div>
-  <service-view v-ref:service_show :data="data" v-if="showview"></service-view>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  // Date格式化
-  Date.prototype.Format = function (fmt) {
-    var o = {
-      'M+': this.getMonth() + 1, // 月份
-      'd+': this.getDate(), // 日
-      'H+': this.getHours(), // 小时
-      'm+': this.getMinutes(), // 分
-      's+': this.getSeconds(), // 秒
-      'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
-      'S': this.getMilliseconds() // 毫秒
-    }
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
-    for (var k in o) {
-      if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
-    }
-    return fmt
-  }
-  export default {
-    title: '报建监控控制层',
-    props: {
-      selectdata: {
-        type: Object
-      },
-      nodeSnapshot: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data() {
-      return {
-        data: null,    // 展示的数据
-        json_datas: null, // json配置数据结构
-        showview: false // 控制显示层显示
-      }
-    },
-    created () {
-      this.initial()
-    },
-    methods: {
-      // 初始化模块
-      async initial() {
-        this.showview = false
-        this.json_datas = this.$workflow_vue
-        let sum = 0
-        let jsonData = {}
-        this.json_datas.activitys.forEach(item => {
-          if (this.selectdata.defname === item.title) {
-            jsonData = item
-            sum++
-          }
-        })
-        if (sum === 0) {
-          this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
-          return
-        }
-        if (sum === 1) {
-          this.data = jsonData
-          this.data = Object.assign({}, this.data, this.selectdata)
-
-          await this.initializtion()
-          this.showview = true
-          return
-        }
-        this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
-      },
-      // json配置数据处理
-      async initializtion() {
-        this.data.fields.forEach(item => {
-          if (this.selectdata[item.field]) {
-            item.value = this.selectdata[item.field]
-          }
-          // 如果配置类型为select,获取options
-          if(item.type==='select'){
-            item.options=[]
-          }
-          if (typeof item.value === 'string' && item.value.startsWith("{") && item.value.endsWith("}")) {
-            item.value = JSON.parse(item.value)
-          }
-        })
-
-        // 控制组件
-        if (this.data.components) {
-          this.data.components.forEach(item => {
-            item.mark = 1
-          })
-        }
-
-
-        // onetomany 数据获取
-        if (this.data.onetomany) {
-          for (let index = 0; index < this.data.onetomany.length; index++) {
-            let http = new HttpResetClass()
-            let data = {
-              tablename: this.data.onetomany[index].tables[0],
-              condition: `f_process_id='${this.selectdata.f_process_id}'`
-            }
-
-            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-              resolveMsg: null,
-              rejectMsg: 'onetomany查询失败'
-            })
-
-            // 初始化 onetomany
-            this.data.onetomany[index].rows = res.data
-
-            // 初始化onetomany中的fields
-            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
-              // 如果配置类型为select,优先从参数列表获取options
-              if (this.data.onetomany[index].fields[j].type === 'select') {
-                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                if (temp && temp.length > 0) {
-                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                }
-              }
-            }
-          }
-        }
-        // 去除button
-        this.data.buttons = null
-
-
-        // 查询是否有当前节点快照信息,如果有使用快照数据，没有则展示最新数据
-        if (this.nodeSnapshot && this.data.nodeSnapshot) {
-          let http = new HttpResetClass()
-          let data = {
-            tablename: 't_node_snapshot',
-            condition: `actid = '${this.selectdata.actid}' and f_process_id='${this.selectdata.f_process_id}'`
-          }
-          let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-            resolveMsg: null,
-            rejectMsg: null
-          })
-          if (res.data.length > 0) {
-            data = JSON.parse(res.data[0].f_node_data)
-
-            this.data.fields = data.fields
-            this.data.onetomany = data.onetomany
-            this.data.title = data.title
-          }
-        }
-
-
-        // 将所有field都不可修改，不可操作
-        this.data.fields.forEach(item => {
-          item.readonly = true
-          item.disabled = true
-        })
-        // 去除所有onetomany的操作
-        if (this.data.onetomany) {
-          this.data.onetomany.forEach(item => {
-            item.hiddenOperate = true
-          })
-        }
-
-        // 完成时间和完成人,部门，分公司
-        if (this.selectdata.state === '结束') {
-          let http = new HttpResetClass()
-          let res = await http.load('POST', 'rs/search', {
-            source: 'this.getInfo()',
-            userid: this.selectdata.userid
-          }, {resolveMsg: null, rejectMsg: null})
-          let user = res.data
-          this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
-          this.data.operator = this.selectdata.person
-          this.data.f_filiale = user.orgs
-          this.data.f_parentname = user.deps
-        }
-      }
-    },
-    events:{
-    },
-    watch: {
-      deep: true
-    }
-  }
-</script>
-<style scoped>
-  /*清除model中的浮动*/
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-</style>
+<template>
+  <div class="auto clearfix">
+    <show-back-reason :selectdata="data"></show-back-reason>
+  </div>
+  <service-view v-ref:service_show :data="data" v-if="showview"></service-view>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  // Date格式化
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      'M+': this.getMonth() + 1, // 月份
+      'd+': this.getDate(), // 日
+      'H+': this.getHours(), // 小时
+      'm+': this.getMinutes(), // 分
+      's+': this.getSeconds(), // 秒
+      'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+      'S': this.getMilliseconds() // 毫秒
+    }
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+    for (var k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+    }
+    return fmt
+  }
+  export default {
+    title: '报建监控控制层',
+    props: {
+      selectdata: {
+        type: Object
+      },
+      nodeSnapshot: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        data: null,    // 展示的数据
+        json_datas: null, // json配置数据结构
+        showview: false // 控制显示层显示
+      }
+    },
+    created () {
+      this.initial()
+    },
+    methods: {
+      // 初始化模块
+      async initial() {
+        this.showview = false
+        this.json_datas = this.$workflow_vue
+        let sum = 0
+        let jsonData = {}
+        this.json_datas.activitys.forEach(item => {
+          if (this.selectdata.defname === item.title) {
+            jsonData = item
+            sum++
+          }
+        })
+        if (sum === 0) {
+          this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
+          return
+        }
+        if (sum === 1) {
+          this.data = jsonData
+          this.data = Object.assign({}, this.data, this.selectdata)
+
+          await this.initializtion()
+          this.showview = true
+          return
+        }
+        this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
+      },
+      // json配置数据处理
+      async initializtion() {
+        this.data.fields.forEach(item => {
+          if (this.selectdata[item.field]) {
+            item.value = this.selectdata[item.field]
+          }
+          // 如果配置类型为select,获取options
+          if(item.type==='select'){
+            item.options=[]
+          }
+          if (typeof item.value === 'string' && item.value.startsWith("{") && item.value.endsWith("}")) {
+            item.value = JSON.parse(item.value)
+          }
+        })
+
+        // 控制组件
+        if (this.data.components) {
+          this.data.components.forEach(item => {
+            item.mark = 1
+          })
+        }
+
+
+        // onetomany 数据获取
+        if (this.data.onetomany) {
+          for (let index = 0; index < this.data.onetomany.length; index++) {
+            let http = new HttpResetClass()
+            let data = {
+              tablename: this.data.onetomany[index].tables[0],
+              condition: `f_process_id='${this.selectdata.f_process_id}'`
+            }
+
+            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: 'onetomany查询失败'
+            })
+
+            // 初始化 onetomany
+            this.data.onetomany[index].rows = res.data
+
+            // 初始化onetomany中的fields
+            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
+              // 如果配置类型为select,优先从参数列表获取options
+              if (this.data.onetomany[index].fields[j].type === 'select') {
+                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                if (temp && temp.length > 0) {
+                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                }
+              }
+            }
+          }
+        }
+        // 去除button
+        this.data.buttons = null
+
+
+        // 查询是否有当前节点快照信息,如果有使用快照数据，没有则展示最新数据
+        if (this.nodeSnapshot && this.data.nodeSnapshot) {
+          let http = new HttpResetClass()
+          let data = {
+            tablename: 't_node_snapshot',
+            condition: `actid = '${this.selectdata.actid}' and f_process_id='${this.selectdata.f_process_id}'`
+          }
+          let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })
+          if (res.data.length > 0) {
+            data = JSON.parse(res.data[0].f_node_data)
+
+            this.data.fields = data.fields
+            this.data.onetomany = data.onetomany
+            this.data.title = data.title
+          }
+        }
+
+
+        // 将所有field都不可修改，不可操作
+        this.data.fields.forEach(item => {
+          item.readonly = true
+          item.disabled = true
+        })
+        // 去除所有onetomany的操作
+        if (this.data.onetomany) {
+          this.data.onetomany.forEach(item => {
+            item.hiddenOperate = true
+          })
+        }
+
+        // 完成时间和完成人,部门，分公司
+        if (this.selectdata.state === '结束') {
+          let http = new HttpResetClass()
+          let res = await http.load('POST', 'rs/search', {
+            source: 'this.getInfo()',
+            userid: this.selectdata.userid
+          }, {resolveMsg: null, rejectMsg: null})
+          let user = res.data
+          this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
+          this.data.operator = this.selectdata.person
+          this.data.f_filiale = user.orgs
+          this.data.f_parentname = user.deps
+        }
+        for (const item of this.data.fields) {
+          debugger
+          if(item.label==='气价名称'){
+            item.value=this.data.f_price_name
+          }
+        }
+      }
+    },
+    events:{
+    },
+    watch: {
+      deep: true
+    }
+  }
+</script>
+<style scoped>
+  /*清除model中的浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+</style>