apply-clients 6.0.1 → 6.0.4

package/src/components/build/Install/Process/CustomerEquipmentMessage.vue

@@ -1,172 +1,172 @@
-<template>
-  <div class="flex-row flex-deviceinfo">
-    <div class="flex-row flex-two-info panel panel-default" v-for="row in devicesinfo">
-      <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename "></avatar-upload>
-      <form class="form-horizontal" style="flex: 1;">
-        <div class="form-group auto"  style="margin-top: 10px;margin-left: 10px;">
-          <div class="col-sm-6" style="padding-right: 5px;" id=userfiles-useDevInf-设备类型>
-            <v-select  :is-all-line="true" :value.sync="row.f_devices_type" v-model="row.f_devices_type"
-                      :options='devicetypes' placeholder='设备类型'
-                      close-on-select></v-select>
-          </div>
-          <div class="col-sm-6" style="padding-right: 5px;">
-            <input type="text" class="form-control" v-else v-model="row.f_devices_no" placeholder='设备编号' v-next-el="{id: $index+'brand'}" >
-          </div>
-        </div>
-        <div class="form-group auto"  style="margin-left: 10px;">
-          <div class="col-sm-6" style="padding-right: 5px;">
-            <input type="text" class="form-control" v-model="row.f_brand" placeholder='设备品牌' v-next-el="{id: $index+'devicesmodel'}"   :id="$index+'brand'">
-          </div>
-          <div class="col-sm-6" style="padding-right: 5px;">
-            <input type="text" class="form-control" v-model="row.f_devices_model" placeholder='设备型号'  :id="$index+'devicesmodel'">
-          </div>
-        </div>
-        <div class="form-group auto"  style="margin-left: 10px;">
-          <div class="col-sm-6" style="padding-right: 5px;">
-            <input type="number" class="form-control" v-model="row.f_devices_num" placeholder='设备数量'   :id="$index+'devicesnum'">
-          </div>
-          <div class="col-sm-6" style="padding-right: 5px;">
-            <input type="text" class="form-control" v-model="row.f_userinfo_id" placeholder='户档案编号'  >
-          </div>
-          <div class="col-sm-6" style="padding-right: 5px;">
-            <!--<input type="text" v-show="false" v-model="$refs.installtime.value"-->
-            <!--v-validate:installtime='{required: true}'/>-->
-            <!--<datepicker-->
-            <!--v-model="row.f_install_date" v-ref:installtime-->
-            <!--:disabled-days-of-Week="[]"-->
-            <!--:value.sync="row.f_install_date"-->
-            <!--:show-reset-button="reset"-->
-            <!--:format="'yyyy-MM-dd'" readonly="readonly">-->
-            <!--</datepicker>-->
-          </div>
-        </div>
-        <div class="form-group auto" style="margin-left: 10px;">
-          <div class="col-sm-6 " style="padding-right: 5px;">
-            <button type="button" @click="deleteDevice($index, row)" class="btn btn-primary" v-show="edit">
-              删除
-            </button>
-          </div>
-          <div class="col-sm-6 " style="padding-right: 5px;" v-if="!row.id">
-            <button type="button" @click="confirm(row,$index)" class="btn btn-primary"  v-show="edit">
-              提交
-            </button>
-          </div>
-        </div>
-      </form>
-      <!--<img :src="imgdelete" alt="图片加载失败" class="img-rounded" style="width: 60px;padding: 20px;margin-left: -15px;cursor: pointer;"-->
-      <!--@click="deleteDevice($index, row)" v-if="row.f_devices_state !== '有效'">-->
-    </div>
-    <div class="panel panel-default flex-two-info text-center" style="line-height: 164px;">
-      <img :src="imgadd" alt="图片加载失败" class="img-rounded" style="width: 60px;padding: 10px;cursor: pointer;" @click="addDevice()">
-    </div>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '设备信息',
-    data () {
-      return {
-        devicetypes: this.$appdata.getParam('设备类型'),
-        flagg: true,
-        devicesinfo:[],
-        userinfoid:'',
-        imgdelete: 'images/mainicon/deletedevice.png',
-        imgadd: 'images/mainicon/adddevice.png'
-      }
-    },
-    props: ['selectdata','edit'],
-    ready() {
-      // 获取数据
-      this.load()
-    },
-    methods: {
-      load() {
-        if (!this.selectdata)
-          return
-        let data = {
-          tablename: 't_devices',
-          condition: 'f_process_id=' + '\'' + String(this.selectdata.f_process_id) + '\''
-        }
-        this.$resetpost('rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: '查询失败'})
-          .then((res) => {
-            this.devicesinfo = []
-            this.devicesinfo = res.data
-          })
-      },
-      confirm(row, index) {
-        //提交前先判断填写的户档案编号是否存在
-        this.$resetpost('rs/sql/findUserInfo', {data:{f_userinfo_id:row.f_userinfo_id,process_id:this.selectdata.f_process_id}}).then((res) => {
-          if(res.data.length > 0){
-            row.f_process_id = this.selectdata.f_process_id
-            row.f_devices_state = '正常'
-            if(row.f_devices_type == '[]'){
-              delete row.f_devices_type
-            }else{
-              row.f_devices_type = row.f_devices_type[0]
-            }
-            let data ={
-              tablename:'t_devices',
-              parameters:row
-            }
-            if(!(row.f_brand&&row.f_devices_model&&row.f_devices_num)){
-              this.$showMessage("请检查设备品牌,设备型号,设备数量是否填写")
-
-            }else{
-              this.$resetpost('rs/logic/saveentity', {data:data},{
-                resolveMsg: null,
-                rejectMsg: '添加失败！'
-              }).then((res) => {
-                this.flagg = false
-                // 如果没有id，需要在数组中添加
-                this.load()
-                this.$showMessage("添加成功！")
-              })
-            }
-          }else {
-            this.$showMessage("不存在的户档案编号！")
-          }
-        })
-
-      },
-      deleteDevice (index, row) {
-        // this.devicesinfo.splice(index, 1)
-        if (!row.id) {
-          // 没有id 从数组里删除
-          this.devicesinfo.splice(index, 1)
-        } else {
-          this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
-            if (res === 'confirm') {
-              let http = new HttpResetClass()
-              http.load('DELETE',`rs/entity/t_devices/${row.id}`).then((res) => {
-                this.load()
-              })
-            }
-          })
-        }
-      },
-      addDevice () {
-        this.devicesinfo.push({
-          f_devices_type: '',
-          f_userinfo_id: this.userinfoid
-          // f_install_date: this.$login.toStandardTimeString()
-        })
-      },
-    },
-
-  }
-</script>
-<style lang="less">
-  .flex-deviceinfo {
-    padding: 0px 20px;
-    justify-content: space-between;
-    height: auto;
-    flex-wrap: wrap;
-  }
-  .flex-two-info {
-    margin-bottom: 10px;
-    align-items: center;
-    width: 48%;
-  }
-</style>
+<template>
+  <div class="flex-row flex-deviceinfo">
+    <div class="flex-row flex-two-info panel panel-default" v-for="row in devicesinfo">
+      <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename "></avatar-upload>
+      <form class="form-horizontal" style="flex: 1;">
+        <div class="form-group auto"  style="margin-top: 10px;margin-left: 10px;">
+          <div class="col-sm-6" style="padding-right: 5px;" id=userfiles-useDevInf-设备类型>
+            <v-select  :is-all-line="true" :value.sync="row.f_devices_type" v-model="row.f_devices_type"
+                      :options='devicetypes' placeholder='设备类型'
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-6" style="padding-right: 5px;">
+            <input type="text" class="form-control" v-else v-model="row.f_devices_no" placeholder='设备编号' v-next-el="{id: $index+'brand'}" >
+          </div>
+        </div>
+        <div class="form-group auto"  style="margin-left: 10px;">
+          <div class="col-sm-6" style="padding-right: 5px;">
+            <input type="text" class="form-control" v-model="row.f_brand" placeholder='设备品牌' v-next-el="{id: $index+'devicesmodel'}"   :id="$index+'brand'">
+          </div>
+          <div class="col-sm-6" style="padding-right: 5px;">
+            <input type="text" class="form-control" v-model="row.f_devices_model" placeholder='设备型号'  :id="$index+'devicesmodel'">
+          </div>
+        </div>
+        <div class="form-group auto"  style="margin-left: 10px;">
+          <div class="col-sm-6" style="padding-right: 5px;">
+            <input type="number" class="form-control" v-model="row.f_devices_num" placeholder='设备数量'   :id="$index+'devicesnum'">
+          </div>
+          <div class="col-sm-6" style="padding-right: 5px;">
+            <input type="text" class="form-control" v-model="row.f_userinfo_id" placeholder='户档案编号'  >
+          </div>
+          <div class="col-sm-6" style="padding-right: 5px;">
+            <!--<input type="text" v-show="false" v-model="$refs.installtime.value"-->
+            <!--v-validate:installtime='{required: true}'/>-->
+            <!--<datepicker-->
+            <!--v-model="row.f_install_date" v-ref:installtime-->
+            <!--:disabled-days-of-Week="[]"-->
+            <!--:value.sync="row.f_install_date"-->
+            <!--:show-reset-button="reset"-->
+            <!--:format="'yyyy-MM-dd'" readonly="readonly">-->
+            <!--</datepicker>-->
+          </div>
+        </div>
+        <div class="form-group auto" style="margin-left: 10px;">
+          <div class="col-sm-6 " style="padding-right: 5px;">
+            <button type="button" @click="deleteDevice($index, row)" class="btn btn-primary" v-show="edit">
+              删除
+            </button>
+          </div>
+          <div class="col-sm-6 " style="padding-right: 5px;" v-if="!row.id">
+            <button type="button" @click="confirm(row,$index)" class="btn btn-primary"  v-show="edit">
+              提交
+            </button>
+          </div>
+        </div>
+      </form>
+      <!--<img :src="imgdelete" alt="图片加载失败" class="img-rounded" style="width: 60px;padding: 20px;margin-left: -15px;cursor: pointer;"-->
+      <!--@click="deleteDevice($index, row)" v-if="row.f_devices_state !== '有效'">-->
+    </div>
+    <div class="panel panel-default flex-two-info text-center" style="line-height: 164px;">
+      <img :src="imgadd" alt="图片加载失败" class="img-rounded" style="width: 60px;padding: 10px;cursor: pointer;" @click="addDevice()">
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '设备信息',
+    data () {
+      return {
+        devicetypes: this.$appdata.getParam('设备类型'),
+        flagg: true,
+        devicesinfo:[],
+        userinfoid:'',
+        imgdelete: 'images/mainicon/deletedevice.png',
+        imgadd: 'images/mainicon/adddevice.png'
+      }
+    },
+    props: ['selectdata','edit'],
+    ready() {
+      // 获取数据
+      this.load()
+    },
+    methods: {
+      load() {
+        if (!this.selectdata)
+          return
+        let data = {
+          tablename: 't_devices',
+          condition: 'f_process_id=' + '\'' + String(this.selectdata.f_process_id) + '\''
+        }
+        this.$resetpost('rs/sql/applysingleTable', {data: data}, {resolveMsg: null, rejectMsg: '查询失败'})
+          .then((res) => {
+            this.devicesinfo = []
+            this.devicesinfo = res.data
+          })
+      },
+      confirm(row, index) {
+        //提交前先判断填写的户档案编号是否存在
+        this.$resetpost('rs/sql/findUserInfo', {data:{f_userinfo_id:row.f_userinfo_id,process_id:this.selectdata.f_process_id}}).then((res) => {
+          if(res.data.length > 0){
+            row.f_process_id = this.selectdata.f_process_id
+            row.f_devices_state = '正常'
+            if(row.f_devices_type == '[]'){
+              delete row.f_devices_type
+            }else{
+              row.f_devices_type = row.f_devices_type[0]
+            }
+            let data ={
+              tablename:'t_devices',
+              parameters:row
+            }
+            if(!(row.f_brand&&row.f_devices_model&&row.f_devices_num)){
+              this.$showMessage("请检查设备品牌,设备型号,设备数量是否填写")
+
+            }else{
+              this.$resetpost('rs/logic/saveentity', {data:data},{
+                resolveMsg: null,
+                rejectMsg: '添加失败！'
+              }).then((res) => {
+                this.flagg = false
+                // 如果没有id，需要在数组中添加
+                this.load()
+                this.$showMessage("添加成功！")
+              })
+            }
+          }else {
+            this.$showMessage("不存在的户档案编号！")
+          }
+        })
+
+      },
+      deleteDevice (index, row) {
+        // this.devicesinfo.splice(index, 1)
+        if (!row.id) {
+          // 没有id 从数组里删除
+          this.devicesinfo.splice(index, 1)
+        } else {
+          this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
+            if (res === 'confirm') {
+              let http = new HttpResetClass()
+              http.load('DELETE',`rs/entity/t_devices/${row.id}`).then((res) => {
+                this.load()
+              })
+            }
+          })
+        }
+      },
+      addDevice () {
+        this.devicesinfo.push({
+          f_devices_type: '',
+          f_userinfo_id: this.userinfoid
+          // f_install_date: this.$login.toStandardTimeString()
+        })
+      },
+    },
+
+  }
+</script>
+<style lang="less">
+  .flex-deviceinfo {
+    padding: 0px 20px;
+    justify-content: space-between;
+    height: auto;
+    flex-wrap: wrap;
+  }
+  .flex-two-info {
+    margin-bottom: 10px;
+    align-items: center;
+    width: 48%;
+  }
+</style>

package/src/components/build/Install/Process/CustomerEssentialInfo.vue

@@ -229,7 +229,7 @@
           this.$showMessage("请选择用户类型")
         }
         else {
-          this.model.f_apply_type = this.model.f_apply_type + "流程"
+          this.model.f_apply_type = this.model.f_apply_type
           let fileInfoData = this.$parent.$parent.$parent.$parent.$refs.file.fileInfoData
           let recordmessage = this.$parent.$parent.$parent.$parent.$refs.record.model.rows
           let materialmessage = this.$parent.$parent.$parent.$parent.$refs.material.model.rows