apply-clients 3.5.4-8 → 3.5.4-81

package/src/components/product/Material/MaterialDetailed.vue

@@ -175,7 +175,7 @@
       </criteria-paged>
       <p class="bg-info text-center" style="font-size: 20px;height: 5%">
         合计记录共<span style="color: red">{{chargeAll.count}}&ensp;</span>笔，
-        合计数量<span style="color: red">&ensp;{{chargeAll.sum}}&ensp;</span>元
+        合计数量<span style="color: red">&ensp;{{chargeAll.sum}}&ensp;</span>
       </p>
     </div>
 

package/src/components/product/MaterialsManage/MaterialsBase.vue

@@ -1,177 +1,181 @@
-<template>
-  <div class="auto select-overspread" style="overflow-y: scroll;overflow-x: hidden">
-    <ul class="nav nav-tabs" style="position: relative">
-      <p class="bg-info text-center" style="padding: 8px;">{{ title }}</p>
-      <h3 class="txtline" v-if="model.parent_name">上一级【{{ model.parent_name }}】</h3>
-    </ul>
-    <div class="row" style="margin-top:1rem;">
-      <div class="col-sm-6">
-        <label class="font_normal_body">名称</label>
-        <input type="text"
-               :disabled="look"
-               v-model="model.name" style="width:60%"
-               class="input_search full-with" placeholder="名称">
-      </div>
-      <div class="col-sm-6">
-        <label style="width: 80px" class="font_normal_body">类别</label>
-        <v-select :disabled="look"
-                  v-model="model.type"
-                  placeholder='项目类别'
-                  :value.sync="model.type"
-                  :value-single="true"
-                  :options='types'></v-select>
-      </div>
-    </div>
-    <div class="row" style="margin-top:1rem;" v-if="model.type ==='型号'">
-      <div class="col-sm-6">
-        <label class="font_normal_body">单位</label>
-        <input type="text"
-               :disabled="look"
-               v-model="model.unit" style="width:60%"
-               class="input_search full-with" id="name" placeholder="计量单位">
-      </div>
-      <div class="col-sm-6">
-        <label style="width: 80px" class="font_normal_body">编码</label>
-        <input type="text"
-               :disabled="look"
-               v-model="model.code" style="width:60%"
-               class="input_search full-with" id="name" placeholder="物料编码">
-      </div>
-      <div class="col-sm-6">
-        <label class="font_normal_body">单价</label>
-        <input type="text"
-               :disabled="look"
-               v-model="model.price" style="width:60%"
-               class="input_search full-with" id="name" placeholder="物料单价">
-      </div>
-      <div class="col-sm-6">
-        <label style="width: 80px" class="font_normal_body">业务类型</label>
-        <v-select
-                  v-model="model.material_type"
-                  placeholder='请选择'
-                  :value.sync="model.material_type"
-                  :value-single="true"
-                  :options='materialTypeOptions'></v-select>
-      </div>
-    </div>
-    <!--  按钮  -->
-    <div class="row col-sm-12" style="margin-top: 1rem">
-      <button @click="confirm()" v-show="!look" class="btn button_search col-sm-1 col-sm-offset-5"
-              style="width: 70px">
-        <span class="glyphicon glyphicon-floppy-disk"></span>保存
-      </button>
-      <button @click='cancel()' class="btn button_clear col-sm-1 col-sm-offset-1" style="width: 70px">
-        <span class=" glyphicon glyphicon-log-out"></span>返回
-      </button>
-    </div>
-    <div class="row col-sm-12" style="margin-top: 18rem">
-    </div>
-    <work-busy :is-busy="isbusy"></work-busy>
-  </div>
-</template>
-
-<script>
-
-export default {
-  title: '功能',
-  props: ['parent', 'data', 'look', 'title'],
-  data () {
-    return {
-      model: {
-        menu_id: null,
-        menu_name: '',
-        parent_id: '0',
-        component: null,
-        create_by: '',
-        depict: '',
-        type: '',
-        material_type: '',
-        org_id: ''
-      },
-      type: '',
-      isbusy: false,
-      types: this.$appdata.getParam('材料管理-项目类别') ? this.$appdata.getParam('材料管理-项目类别') : [{
-        label: '型号',
-        value: '型号'
-      }, {label: '燃气具设备', value: '燃气具设备'}, {label: '报建', value: '报建'},
-        {label: '规格', value: '规格'}, {label: '材料', value: '材料'}, {label: '品名', value: '品名'}],
-      showFile: 'false',
-      file: [],
-      materialTypeOptions: this.$appdata.getParam('材料管理-业务类型')
-    }
-  },
-  watch: {
-    data: {
-      handler (n, o) {
-        // if (!n.menu_id&&n.menu_id !== o.menu_id)
-        this.initdata()
-      },
-      deep: true // 对象内部属性的监听，关键。
-    }
-  },
-  ready () {
-    this.initdata()
-  },
-  methods: {
-    // 初始化数据
-    initdata () {
-      this.model = {
-        id: null,
-        name: '',
-        parent_id: '0',
-        create_by: '',
-        type: '',
-        org_id: ''
-      }
-      this.model = Object.assign({}, this.model, this.data)
-      this.model.org_id = this.$login.f.orgid
-      // this.type = this.model.type
-      // if (this.model.id) {
-      //   this.$resetpost('rs/sql/singleTable_OrderBy', {
-      //     data: {
-      //       items: '*',
-      //       table: 't_material_info',
-      //       condition: ` 1 = 1 and id = ${this.model.id}`,
-      //       order: 'id desc'
-      //     }
-      //   }, {rejectMsg: null, resolveMsg: null})
-      // }
-    },
-    // 关闭文件上传对话框
-    closeFile () {
-      this.showFile = 'false'
-      // 将选的文件清空
-      this.$refs.file.$el.querySelector('input').value = ''
-    },
-    cancel () {
-      this.$dispatch('cancel')
-    },
-    async confirm () {
-      await this.$resetpost('rs/entity/t_material_info', this.model).then(res =>
-        this.$parent.$refs.funlist.searchData()
-      )
-    },
-    importFile () {
-      this.showFile = 'true'
-    },
-    delFile (row) {
-      if (!this.look) {
-        this.$resetdelete(`rs/entity/t_material_info`, {id: row.id}).then(res =>
-          this.initdata()
-        )
-      }
-    }
-  },
-  events: {}
-}
-</script>
-
-<style>
-.full-with {
-  width: 100%;
-}
-
-#ldapDisplayUploadFile {
-  height: auto !important;
-}
-</style>
+<template>
+  <div class="auto select-overspread" style="overflow-y: scroll;overflow-x: hidden">
+    <ul class="nav nav-tabs" style="position: relative">
+      <p class="bg-info text-center" style="padding: 8px;">{{ title }}</p>
+      <h3 class="txtline" v-if="model.parent_name">上一级【{{ model.parent_name }}】</h3>
+    </ul>
+    <div class="row" style="margin-top:1rem;">
+      <div class="col-sm-6">
+        <label class="font_normal_body">名称</label>
+        <input type="text"
+               :disabled="look"
+               v-model="model.name" style="width:60%"
+               class="input_search full-with" placeholder="名称">
+      </div>
+      <div class="col-sm-6">
+        <label style="width: 80px" class="font_normal_body">类别</label>
+        <v-select :disabled="look"
+                  v-model="model.type"
+                  placeholder='项目类别'
+                  :value.sync="model.type"
+                  :value-single="true"
+                  :options='types'></v-select>
+      </div>
+    </div>
+    <div class="row" style="margin-top:1rem;" v-if="model.type ==='型号'">
+      <div class="col-sm-6">
+        <label class="font_normal_body">单位</label>
+        <input type="text"
+               :disabled="look"
+               v-model="model.unit" style="width:60%"
+               class="input_search full-with"
+               autocomplete="off"
+               id="name" placeholder="计量单位">
+      </div>
+      <div class="col-sm-6">
+        <label style="width: 80px" class="font_normal_body">编码</label>
+        <input type="text"
+               :disabled="look"
+               autocomplete="off"
+               v-model="model.code" style="width:60%"
+               class="input_search full-with" id="name" placeholder="物料编码">
+      </div>
+      <div class="col-sm-6">
+        <label class="font_normal_body">单价</label>
+        <input type="text"
+               :disabled="look"
+               autocomplete="off"
+               v-model="model.price" style="width:60%"
+               class="input_search full-with" id="name" placeholder="物料单价">
+      </div>
+      <div class="col-sm-6">
+        <label style="width: 80px" class="font_normal_body">业务类型</label>
+        <v-select
+                  v-model="model.material_type"
+                  placeholder='请选择'
+                  :value.sync="model.material_type"
+                  :value-single="true"
+                  :options='materialTypeOptions'></v-select>
+      </div>
+    </div>
+    <!--  按钮  -->
+    <div class="row col-sm-12" style="margin-top: 1rem">
+      <button @click="confirm()" v-show="!look" class="btn button_search col-sm-1 col-sm-offset-5"
+              style="width: 70px">
+        <span class="glyphicon glyphicon-floppy-disk"></span>保存
+      </button>
+      <button @click='cancel()' class="btn button_clear col-sm-1 col-sm-offset-1" style="width: 70px">
+        <span class=" glyphicon glyphicon-log-out"></span>返回
+      </button>
+    </div>
+    <div class="row col-sm-12" style="margin-top: 18rem">
+    </div>
+    <work-busy :is-busy="isbusy"></work-busy>
+  </div>
+</template>
+
+<script>
+
+export default {
+  title: '功能',
+  props: ['parent', 'data', 'look', 'title'],
+  data () {
+    return {
+      model: {
+        menu_id: null,
+        menu_name: '',
+        parent_id: '0',
+        component: null,
+        create_by: '',
+        depict: '',
+        type: '',
+        material_type: '',
+        org_id: ''
+      },
+      type: '',
+      isbusy: false,
+      types: this.$appdata.getParam('材料管理-项目类别') ? this.$appdata.getParam('材料管理-项目类别') : [{
+        label: '型号',
+        value: '型号'
+      }, {label: '燃气具设备', value: '燃气具设备'}, {label: '报建', value: '报建'},
+        {label: '规格', value: '规格'}, {label: '材料', value: '材料'}, {label: '品名', value: '品名'}],
+      showFile: 'false',
+      file: [],
+      materialTypeOptions: this.$appdata.getParam('材料管理-业务类型')
+    }
+  },
+  watch: {
+    data: {
+      handler (n, o) {
+        // if (!n.menu_id&&n.menu_id !== o.menu_id)
+        this.initdata()
+      },
+      deep: true // 对象内部属性的监听，关键。
+    }
+  },
+  ready () {
+    this.initdata()
+  },
+  methods: {
+    // 初始化数据
+    initdata () {
+      this.model = {
+        id: null,
+        name: '',
+        parent_id: '0',
+        create_by: '',
+        type: '',
+        org_id: ''
+      }
+      this.model = Object.assign({}, this.model, this.data)
+      this.model.org_id = this.$login.f.orgid
+      // this.type = this.model.type
+      // if (this.model.id) {
+      //   this.$resetpost('rs/sql/singleTable_OrderBy', {
+      //     data: {
+      //       items: '*',
+      //       table: 't_material_info',
+      //       condition: ` 1 = 1 and id = ${this.model.id}`,
+      //       order: 'id desc'
+      //     }
+      //   }, {rejectMsg: null, resolveMsg: null})
+      // }
+    },
+    // 关闭文件上传对话框
+    closeFile () {
+      this.showFile = 'false'
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+    },
+    cancel () {
+      this.$dispatch('cancel')
+    },
+    async confirm () {
+      await this.$resetpost('rs/entity/t_material_info', this.model).then(res =>
+        this.$parent.$refs.funlist.searchData()
+      )
+    },
+    importFile () {
+      this.showFile = 'true'
+    },
+    delFile (row) {
+      if (!this.look) {
+        this.$resetdelete(`rs/entity/t_material_info`, {id: row.id}).then(res =>
+          this.initdata()
+        )
+      }
+    }
+  },
+  events: {}
+}
+</script>
+
+<style>
+.full-with {
+  width: 100%;
+}
+
+#ldapDisplayUploadFile {
+  height: auto !important;
+}
+</style>

package/src/components/product/MaterialsManage/MaterialsManage.vue

@@ -1,60 +1,60 @@
-<template>
-  <div id="unit" class="flex-row">
-    <apply-material-display @select-changed='selected' @modify-res="modifyRes"
-                      @add-res="addRes"
-                      class="basic-main" style="width:auto;" v-ref:funlist>
-    </apply-material-display>
-    <div class="binary-right" style="width: 40%;overflow-x: hidden; overflow-y: scroll;" v-if="row">
-      <apply-materials-base  :look='look' :data="row" :title="title"
-                       :parent="row.parent_name" @cancel="cancel">
-      </apply-materials-base>
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  title: '功能展示',
-  data () {
-    return {
-      row: null,
-      look: true,
-      title: '功能信息'
-    }
-  },
-  methods: {
-    // 选中数据
-    selected (obj) {
-      this.title = '功能信息'
-      this.look = true
-      this.row = obj.val.data
-    },
-    // 修改数据
-    modifyRes (obj) {
-      this.title = '修改信息'
-      this.row = obj.data
-      this.look = false
-    },
-    // 添加数据
-    addRes (obj) {
-      this.title = '添加功能'
-      let type = ''
-      if (obj.type === '品名') {
-        type = '规格'
-      } else if (obj.type === '规格') {
-        type = '型号'
-      }
-      this.row = Object.assign({}, {parent_id: obj.id, type: type})
-      this.look = false
-    },
-    // 返回
-    cancel () {
-      // 把选择的节点清空  不然点击同样的节点点不出来
-      this.$refs.funlist.$refs.list.selectStore.selected = null
-      this.row = null
-    }
-
-  }
-}
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <apply-material-display @select-changed='selected' @modify-res="modifyRes"
+                      @add-res="addRes"
+                      class="basic-main" style="width:auto;" v-ref:funlist>
+    </apply-material-display>
+    <div class="binary-right" style="width: 40%verflow-x: hidden; overflow-y: scroll;" v-if="row">
+      <apply-materials-base  :look='look' :data="row" :title="title"
+                       :parent="row.parent_name" @cancel="cancel">
+      </apply-materials-base>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  title: '物料配置',
+  data () {
+    return {
+      row: null,
+      look: true,
+      title: '功能信息'
+    }
+  },
+  methods: {
+    // 选中数据
+    selected (obj) {
+      this.title = '功能信息'
+      this.look = true
+      this.row = obj.val.data
+    },
+    // 修改数据
+    modifyRes (obj) {
+      this.title = '修改信息'
+      this.row = obj.data
+      this.look = false
+    },
+    // 添加数据
+    addRes (obj) {
+      this.title = '添加功能'
+      let type = ''
+      if (obj.type === '品名') {
+        type = '规格'
+      } else if (obj.type === '规格') {
+        type = '型号'
+      }
+      this.row = Object.assign({}, {parent_id: obj.id, type: type})
+      this.look = false
+    },
+    // 返回
+    cancel () {
+      // 把选择的节点清空  不然点击同样的节点点不出来
+      this.$refs.funlist.$refs.list.selectStore.selected = null
+      this.row = null
+    }
+
+  }
+}
+</script>

package/src/components/product/PcZhihuanManagement.vue

@@ -0,0 +1,160 @@
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">检查项目</th>
+          <th class="textNoLineBreak">检查结果</th>
+          <th class="textNoLineBreak">操作</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;" >
+            <nobr>{{row.f_check_list}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_check_value}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                @click="$parent.$parent.showModal(row)"
+              >查看照片</button>
+            </nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <validator name="v">
+      <modal v-if="showCheckModel" :show.sync="showCheckModel" v-ref:modal :large="true" :backdrop="false" title="收费明细">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+          <h4 class="modal-title">检查明细照片</h4>
+        </header>
+        <article slot="modal-body" class="modal-body clearfix">
+          <div :class="bootstraped ? bootstraped + ' showData' : 'col-sm-6 showData'" v-for="row in fileInfoData">
+            <div class="col-sm-12 item">
+              <div class="left col-sm-5">
+                <a href="#" class="thumbnail" style="width: 100%;height: 100%">
+                  <img  :src="row" alt="..."/>
+                </a>
+              </div>
+            </div>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+        </footer>
+      </modal>
+    </validator>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+import {isEmpty} from "../Util";
+
+export default {
+  title: '检查项管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+  },
+  data () {
+    return {
+      model: {
+        data: null
+      },
+      flag:0,
+      showCheckModel: false,
+      checkList:{},
+      item: [{label: '是', value: '是'},{label: '否', value: '否'}],
+      hasList:false,
+      savelist:[],
+      fileInfoData:[]
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    showModal(row){
+      this.load(row)
+      this.showCheckModel=true
+    },
+    closeModal() {
+      this.showCheckModel=false
+    },
+    //查询
+    async search() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_apply_check',
+        condition: `f_process_id= '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '开发商档案查询失败！！！'
+      })
+      if(res.data.length>0){
+        this.model.data=res.data
+      }
+    },
+    async load(row) {
+      this.fileInfoData=[]
+      let condition = ''
+      condition = `f_blobid= '${this.selectdata.f_process_id}' and  fremarks='${this.selectdata.f_apply_num+row.id}' `
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_files',
+        condition: condition + ` order by f_uploaddate desc `
+      }
+      let getFile = await http.load('POST', 'rs/sql/apply_singleTable', {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+      for (var i = 0; i < getFile.data.length; i++) {
+        // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+        if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
+          getFile.data.splice(i,1)
+          i--
+          continue
+        }
+        let temp = getFile.data[i].f_filename
+        let  src = "http://" + location.host + "/rs/image/file/" + temp
+        this.fileInfoData.push(src)
+      }
+    },
+  },
+  events: {
+  },
+  computed: {
+    CheckItems() {
+      return this.$appdata.getParam("报建检查项目")
+    }
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.textNoLineBreak {
+  white-space: nowrap;
+}
+.head-but{
+  margin-left: 5px;
+  height: 34px;
+  /*background-color: #6aa6e2;*/
+  border-radius: 4px;
+  font-family: PingFang;
+  color: #ffffff;
+}
+</style>