telephone-clients 3.0.100 → 3.0.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.100",
+  "version": "3.0.101",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/ExportExcel.vue

@@ -36,306 +36,307 @@
 </template>
 
 <script>
-import co from 'co'
-import {HttpResetClass} from 'vue-client'
-import Vue from "vue";
+  import co from 'co'
+  import {HttpResetClass} from 'vue-client'
+  import Vue from "vue";
 
-let postGen = function* (self) {
-  try {
-    let p = {}
-    // 判断如果有field，说明表头为自动生成，否则为模板导出
-    if (self.exporthead) {
-      if (self.sqlName) {
-        p = yield self.$resetpost(self.sqlurl, {
-          data: {
-            body: {
-              header: self.header,
-              footer: self.footer,
-              sumName: self.sumname,
-              data: self.data,
-              field: self.exporthead,
-              templateName: self.templateName,
-              sqlName: self.sqlName,
-              uuid: self.uuid
-            },
-            bean: self.bean
-          }
-        }, {resolveMsg: null, rejectMsg: null}, 1000)
-      } else if (self.pathName) {
+  let postGen = function* (self) {
+    try {
+      let p = {}
+      // 判断如果有field，说明表头为自动生成，否则为模板导出
+      if (self.exporthead) {
+        if (self.sqlName) {
+          p = yield self.$resetpost(self.sqlurl, {
+            data: {
+              body: {
+                header: self.header,
+                footer: self.footer,
+                sumName: self.sumname,
+                data: self.data,
+                field: self.exporthead,
+                templateName: self.templateName,
+                sqlName: self.sqlName,
+                uuid: self.uuid
+              },
+              bean: self.bean
+            }
+          }, {resolveMsg: null, rejectMsg: null}, 1000)
+        } else if (self.pathName) {
+          p = yield self.$resetpost(self.sqlurl, {
+            data: {
+              body: {
+                sumName: self.sumname,
+                data: self.data,
+                field: self.exporthead,
+                templateName: self.templateName,
+                pathName: self.pathName,
+                uuid: self.uuid
+              },
+              bean: self.bean
+            }
+          }, {resolveMsg: null, rejectMsg: null}, 0)
+        }
+      } else {
         p = yield self.$resetpost(self.sqlurl, {
           data: {
-            body: {
-              sumName: self.sumname,
-              data: self.data,
-              field: self.exporthead,
-              templateName: self.templateName,
-              pathName: self.pathName,
-              uuid: self.uuid
-            },
+            body: {sumName: self.sumname, data: self.data, total: self.total, uuid: self.uuid},
             bean: self.bean
           }
         }, {resolveMsg: null, rejectMsg: null}, 0)
       }
-    } else {
-      p = yield self.$resetpost(self.sqlurl, {
-        data: {
-          body: {sumName: self.sumname, data: self.data, total: self.total, uuid: self.uuid},
-          bean: self.bean
-        }
-      }, {resolveMsg: null, rejectMsg: null}, 0)
+    } catch (e) {
+      console.error(e)
     }
-  } catch (e) {
-    console.error(e)
+    self.modelval = []
+    self.fields = {}
+    self.exporthead = []
+    self.progressQuery()
   }
-  self.modelval = []
-  self.fields = {}
-  self.exporthead = []
-  self.progressQuery()
-}
 
-export default {
-  //uuid:需要导出的Excel对应的key
-  // data:sql需要的替换字段
-  // sqlurl:导出Excel查询的sql语句
-  // field:需要导出Excel的字段名和对应中文名或hbm配置文件名（全名）
-  // total:统计字段（统计行）
-  // props: ['data', 'sqlurl', 'field', 'total', 'bean', 'chooseCol','sumName'],
-  data() {
-    return {
-      uuid: '',
-      show: false,
-      all: false,
-      fields: {},
-      modelval: [],
-      // 表头
-      exporthead: [],
-      selftotal: [],
-      // sumName:[],
-      // 进度条显示
-      progressShow: false,
-      // 进度百分比
-      percent: '0%',
-      // 定时器
-      timer: null,
-      // 请求对象
-      HttpReset: new HttpResetClass()
-    }
-  },
-  props: {
-    // 表头
-    header: {},
-    // 表尾
-    footer: {},
-    sumname: {},
-    data: {},
-    sqlurl: {
-      type: String
-    },
-    field: {},
-    total: {},
-    bean: {
-      type: String
-    },
-    progress: {
-      type: String,
-      default: 'getExportProgress'
-    },
-    btnName: {
-      type: String,
-      default: '导出Excel'
-    },
-    templateName: {
-      type: String
-    },
-    sqlName: {
-      type: String
-    },
-    pathName: {
-      type: String
-    },
-    attach: {
-      type: String,
-      default: 'name'
+  export default {
+    //uuid:需要导出的Excel对应的key
+    // data:sql需要的替换字段
+    // sqlurl:导出Excel查询的sql语句
+    // field:需要导出Excel的字段名和对应中文名或hbm配置文件名（全名）
+    // total:统计字段（统计行）
+    // props: ['data', 'sqlurl', 'field', 'total', 'bean', 'chooseCol','sumName'],
+    data() {
+      return {
+        uuid: '',
+        show: false,
+        all: false,
+        fields: {},
+        modelval: [],
+        // 表头
+        exporthead: [],
+        selftotal: [],
+        // sumName:[],
+        // 进度条显示
+        progressShow: false,
+        // 进度百分比
+        percent: '0%',
+        // 定时器
+        timer: null,
+        // 请求对象
+        HttpReset: new HttpResetClass()
+      }
     },
-    chooseCol: {
-      type: Boolean,
-      default: false
+    props: {
+      // 表头
+      header: {},
+      // 表尾
+      footer: {},
+      sumname: {},
+      data: {},
+      sqlurl: {
+        type: String
+      },
+      field: {},
+      total: {},
+      bean: {
+        type: String
+      },
+      progress: {
+        type: String,
+        default: 'getExportProgress'
+      },
+      btnName: {
+        type: String,
+        default: '导出Excel'
+      },
+      templateName: {
+        type: String
+      },
+      sqlName: {
+        type: String
+      },
+      pathName: {
+        type: String
+      },
+      attach: {
+        type: String,
+        default: 'name'
+      },
+      chooseCol: {
+        type: Boolean,
+        default: false
+      },
+      isshow: {
+        type: Boolean,
+        default: true
+      },
+      defaultselect: [],
+      chooserow: {
+        type: Boolean,
+        default: false
+      }
     },
-    isshow: {
-      type: Boolean,
-      default: true
+    beforeDestroy() {
+      this.closeTimer()
     },
-    defaultselect: [],
-    chooserow: {
-      type: Boolean,
-      default: false
-    }
-  },
-  beforeDestroy() {
-    this.closeTimer()
-  },
-  methods: {
+    methods: {
 
-    exportExcel() {
-      //tag
-      if (this.field) {
-        if (this.chooseCol === true) {
-          this.fields = this.field
-          this.show = true;
-          //
-          if (this.defaultselect != null && this.defaultselect) {
-            for (var item in this.defaultselect) {
-              this.modelval.push(item)
+      exportExcel() {
+        //tag
+        if (this.field) {
+          if (this.chooseCol === true) {
+            this.fields = this.field
+            this.show = true;
+            //
+            if (this.defaultselect != null && this.defaultselect) {
+              for (var item in this.defaultselect) {
+                this.modelval.push(item)
+              }
+              if (this.chooserow) {
+                this.export()
+              }
             }
-            if (this.chooserow) {
-              this.export()
-            }
-          }
 
+          } else {
+            this.data.items = '*'
+            Object.keys(this.field).forEach((key) => {
+              this.exporthead.push(key + ':' + this.field[key])
+            })
+            this.post()
+          }
         } else {
-          this.data.items = '*'
-          Object.keys(this.field).forEach((key) => {
-            this.exporthead.push(key + ':' + this.field[key])
-          })
           this.post()
         }
-      } else {
+      },
+      export() {
+        if (this.$login.r.includes('限制导出')) {
+          this.$showMessage('你被限制导出, 请联系管理员')
+          return
+        }
+        // 获取导出选择的表头和列
+        let temp = ''
+        this.modelval.forEach((item) => {
+          temp = temp + item + ','
+          this.exporthead.push(item + ':' + this.field[item])
+          //this.exporthead[item] = this.field[item]
+        })
+        temp = temp.slice(0, temp.length - 1)
+        //tag
+        this.data.items = temp
         this.post()
-      }
-    },
-    export() {
-      if (this.$login.r.includes('限制导出')) {
-        this.$showMessage('你被限制导出, 请联系管理员')
-        return
-      }
-      // 获取导出选择的表头和列
-      let temp = ''
-      this.modelval.forEach((item) => {
-        temp = temp + item + ','
-        this.exporthead.push(item + ':' + this.field[item])
-        //this.exporthead[item] = this.field[item]
-      })
-      temp = temp.slice(0, temp.length - 1)
-      //tag
-      this.data.items = temp
-      this.post()
-    },
-    post() {
-      // if(this.total) {
-      //
-      //   var temp={"合计":"合计"}
-      //   for (var a in this.field) {
-      //     for (var b in this.total) {
-      //         if(a==b){
-      //           temp[a]=this.total[a]
-      //         }
-      //     }
-      //   }
-      //   this.selftotal.push(temp)
-      //   //tag
-      //   //tag
-      //
-      //   // this.selftotal.push(this.total)
-      //   // this.selftotal[0].a="合计"
-      // }
-      this.uuid = this.guid();
-      let gen = postGen(this)
-      co(gen)
-    },
-    stamp() {
-      this.modelval = []
-      this.show = true
-    },
-    sortModelval() {
-      let sortModel = []
-      Object.keys(this.fields).forEach((key) => {
-        if (this.modelval.includes(key)) {
-          sortModel.push(key)
+      },
+      post() {
+        // if(this.total) {
+        //
+        //   var temp={"合计":"合计"}
+        //   for (var a in this.field) {
+        //     for (var b in this.total) {
+        //         if(a==b){
+        //           temp[a]=this.total[a]
+        //         }
+        //     }
+        //   }
+        //   this.selftotal.push(temp)
+        //   //tag
+        //   //tag
+        //
+        //   // this.selftotal.push(this.total)
+        //   // this.selftotal[0].a="合计"
+        // }
+        this.uuid = this.guid();
+        let gen = postGen(this)
+        co(gen)
+      },
+      stamp() {
+        this.modelval = []
+        this.show = true
+      },
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        //tag
+        this.modelval = sortModel
+      },
+      close() {
+        this.closeTimer()
+        this.all = false
+        this.modelval = []
+        this.show = false
+        this.progressShow = false
+        this.percent = '0%'
+      },
+      progressQuery() {
+        //tag
+        this.progressShow = true
+        // 启动定时器之前先关闭定时器,防止之前的定时器未关闭
+        this.closeTimer()
+        // 立即执行一遍
+        this.progressTask()
+        this.timer = setInterval(this.progressTask, 3000)
+      },
+      async progressTask() {
+        let self = this
+        let url = 'rs/logic/getBatchOperaPro'
+        if (Vue.$appdata.getSingleValue('工单excel单值')) {
+          url = 'rs/logic/getBatchOperaProNew'
         }
-      })
-      //tag
-      this.modelval = sortModel
-    },
-    close() {
-      this.closeTimer()
-      this.all = false
-      this.modelval = []
-      this.show = false
-      this.progressShow = false
-      this.percent = '0%'
-    },
-    progressQuery() {
-      //tag
-      this.progressShow = true
-      // 启动定时器之前先关闭定时器,防止之前的定时器未关闭
-      this.closeTimer()
-      // 立即执行一遍
-      this.progressTask()
-      this.timer = setInterval(this.progressTask, 3000)
-    },
-    async progressTask() {
-      let self = this
-      let url ='rs/logic/getBatchOperaPro'
-      if(Vue.$appdata.getSingleValue('工单excel单值')){
-        url = 'rs/logic/getBatchOperaProNew'
-      }
 
-      let res = await self.HttpReset.load('POST', url,{data: {uuid: self.uuid}}, {resolveMsg: null, rejectMsg: null})
-      res = res.data
-      //tag
-      if (res.error) {
-        self.$showAlert(`导出excel错误: ${res.error}`, 'danger', 0)
-        self.closeTimer()
-      } else {
-        // self.$showAlert(`${res.msg}`, 'success', 2000)
-        self.percent = (res.percent ? res.percent : 0) + '%'
-        // 进度100%
-        if (res.fileName && res.percent == 100) {
-          var link = document.createElement('a');
-          res.fileName.forEach((item) => {
-            //tag
-            // let path = item.filename.substring(item.filename.indexOf('webapps'), (item.filename.length))
-            // let pathName = path.substring(path.indexOf('/') + 1, path.length)
-            let path = item.filename
-            //webapps这个是在服务器上导出用的
-            let xy=this.$appdata.getSingleValue('协议')?this.$appdata.getSingleValue('协议'):"http://"
-            let pathName = xy + location.host + "/webapps" + path.split('webapps')[1]
-            //excel这个是在本地导出用的
-            // let pathName = "http://" + location.host + "/excel" + path.split('excel')[1]
-            link.href = pathName;
-            link.download = path.split('excel/')[1];
-            link.dispatchEvent(new MouseEvent('click'));
-          })
-          self.close()
+        let res = await self.HttpReset.load('POST', url, {data: {uuid: self.uuid}}, {resolveMsg: null, rejectMsg: null})
+        res = res.data
+        //tag
+        if (res.error) {
+          self.$showAlert(`导出excel错误: ${res.error}`, 'danger', 0)
+          self.closeTimer()
+        } else {
+          // self.$showAlert(`${res.msg}`, 'success', 2000)
+          self.percent = (res.percent ? res.percent : 0) + '%'
+          res.percent = res.fileName ? 100 : res.percent
+          // 进度100%
+          if (res.fileName && res.percent == 100) {
+            var link = document.createElement('a');
+            res.fileName.forEach((item) => {
+              //tag
+              // let path = item.filename.substring(item.filename.indexOf('webapps'), (item.filename.length))
+              // let pathName = path.substring(path.indexOf('/') + 1, path.length)
+              let path = item.filename
+              //webapps这个是在服务器上导出用的
+              let xy = this.$appdata.getSingleValue('协议') ? this.$appdata.getSingleValue('协议') : "http://"
+              let pathName = xy + location.host + "/webapps" + path.split('webapps')[1]
+              //excel这个是在本地导出用的
+              // let pathName = "http://" + location.host + "/excel" + path.split('excel')[1]
+              link.href = pathName;
+              link.download = path.split('excel/')[1];
+              link.dispatchEvent(new MouseEvent('click'));
+            })
+            self.close()
+          }
         }
+      },
+      // 关闭定时器
+      closeTimer() {
+        if (this.timer) {
+          clearInterval(this.timer)
+          this.timer = null
+        }
+      },
+      guid() {
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let r = Math.random() * 16 | 0,
+            v = c == 'x' ? r : (r & 0x3 | 0x8)
+          return v.toString(16)
+        })
       }
     },
-    // 关闭定时器
-    closeTimer() {
-      if (this.timer) {
-        clearInterval(this.timer)
-        this.timer = null
-      }
-    },
-    guid() {
-      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        let r = Math.random() * 16 | 0,
-          v = c == 'x' ? r : (r & 0x3 | 0x8)
-        return v.toString(16)
-      })
-    }
-  },
-  watch: {
-    'all'(val) {
-      if (val) {
-        this.modelval = Object.keys(this.fields)
-      } else {
-        this.modelval = []
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = Object.keys(this.fields)
+        } else {
+          this.modelval = []
+        }
+      },
+      'modelval.length'() {
+        this.sortModelval()
       }
-    },
-    'modelval.length'() {
-      this.sortModelval()
     }
   }
-}
 </script>

package/src/components/MaterialsManage/MaterialsBase.vue

@@ -13,7 +13,7 @@
                class="input_search full-with" placeholder="名称">
       </div>
       <div class="col-sm-6">
-        <label class="font_normal_body">类别</label>
+        <label style="width: 80px" class="font_normal_body">类别</label>
         <v-select :disabled="look"
                   v-model="model.type"
                   placeholder='项目类别'
@@ -31,7 +31,7 @@
                class="input_search full-with" id="name" placeholder="计量单位">
       </div>
       <div class="col-sm-6">
-        <label class="font_normal_body">编码</label>
+        <label style="width: 80px" class="font_normal_body">编码</label>
         <input type="text"
                :disabled="look"
                v-model="model.code" style="width:60%"
@@ -44,6 +44,15 @@
                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">
@@ -75,7 +84,9 @@ export default {
         component: null,
         create_by: '',
         depict: '',
-        type: ''
+        type: '',
+        material_type: '',
+        org_id: ''
       },
       type: '',
       isbusy: false,
@@ -85,7 +96,8 @@ export default {
       }, {label: '燃气具设备', value: '燃气具设备'}, {label: '报建', value: '报建'},
         {label: '规格', value: '规格'}, {label: '材料', value: '材料'}, {label: '品名', value: '品名'}],
       showFile: 'false',
-      file: []
+      file: [],
+      materialTypeOptions: this.$appdata.getParam('材料管理-业务类型')
     }
   },
   watch: {
@@ -108,9 +120,11 @@ export default {
         name: '',
         parent_id: '0',
         create_by: '',
-        type: ''
+        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', {