vue2-client 1.2.1 → 1.2.2

package/docs/notice.md

@@ -2,9 +2,7 @@
 ## 引入各种文件时,必须写绝对路径, 不允许写相对路径
 ```js
 // 引自己项目时文件时,  @ 表示自己项目的src目录
-import('@/pages/safeguard/list/search/UserFiles')
-// 引入vue2-client项目文件时, @vue2-client: 表示@vue2-client下的src目录
-import { post } from '@vue2-client/services/api/restTools'
+import('@vue2-client/pages/system/queryParams')
 ```
 ## 编写vue文件的样式时, 必须使用less, 样式必须在最外层添加当前页面html的id, id与vue文件名相同
 ```vue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQuery.vue

@@ -229,18 +229,9 @@
                 <a-col :span="8">
                   <a-form-model-item label="表单查询方式" prop="queryType" v-if="dataMode.queryForm && dataMode.sqlQueryCondition">
                     <a-select v-model="item.queryType" placeholder="表单查询方式，可选">
-                      <a-select-option key="=">相等(=)</a-select-option>
-                      <a-select-option key="!=">不相等(!=)</a-select-option>
-                      <a-select-option key="LIKE">全模糊(like)</a-select-option>
-                      <a-select-option key="LEFT_LIKE">左模糊(left like)</a-select-option>
-                      <a-select-option key="RIGHT_LIKE">右模糊(right like)</a-select-option>
-                      <a-select-option key=">">大于(>)</a-select-option>
-                      <a-select-option key=">=">大于等于(>=)</a-select-option>
-                      <a-select-option key="<">小于(<)</a-select-option>
-                      <a-select-option key="<=">小于等于(<=)</a-select-option>
-                      <a-select-option key="IN">包含(in)</a-select-option>
-                      <a-select-option key="NOT_IN">不包含(not in)</a-select-option>
-                      <a-select-option key="BETWEEN">之间(between)</a-select-option>
+                      <template v-for="queryTypeItem in queryTypeV">
+                        <a-select-option :key="queryTypeItem.key">{{ queryTypeItem.label }}</a-select-option>
+                      </template>
                     </a-select>
                   </a-form-model-item>
                 </a-col>
@@ -601,6 +592,7 @@ import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormIte
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
+import { queryType } from '@/config/CreateQueryConfig'
 import { mapState } from 'vuex'
 import { post } from '@vue2-client/services/api/restTools'
 import { commonApi } from '@vue2-client/services/api/common'
@@ -690,6 +682,12 @@ export default {
   },
   computed: {
     ...mapState('setting', ['isMobile']),
+    queryTypeV () {
+      if (this.item.formType) {
+        return queryType.filter(item => item.match.includes(this.item.formType))
+      }
+      return queryType
+    },
     conditionJoinArray: function () {
       const result = []
       for (const item in this.form.joinArray) {

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -283,7 +283,9 @@ export default {
     },
     // 刷新加载表格数据
     loadData (requestParameters, callback) {
-      callback(query(requestParameters))
+      const result = query(requestParameters)
+      this.$emit('afterQuery', result)
+      callback(result)
     },
     // 详情按钮事件
     action (record, id) {

package/src/base-client/components/common/XFormTable/index.md

@@ -47,7 +47,7 @@ export default {
 | @action            | 表格详情列的单击事件              | event   | -     |
 | @afterSubmit       | 增删改提交后的回调方法             | event   | -     |
 | @afterSearchSubmit | 查询提交后的回调方法              | event   | -     |
-
+ | @afterQuery        | 表格查询后的回调方法              | event   | -     |
 ## 例子1
 ----
 （基础使用）

package/src/base-client/components/ticket/EmployeeDetailsView/EmployeeDetailsView.vue

@@ -153,16 +153,10 @@ export default {
       // 7日新增完成数
       finishLastWeekCount: 0,
       // 控制订单完成比例颜色
-      finishRatioColor: '',
-      // 部门名字典
-      departmentDictionary: [],
-      // 模块名字典
-      modelDictionary: []
+      finishRatioColor: ''
     }
   },
   mounted () {
-    this.getDepartmentDictionary()
-    this.getModelDictionary()
     this.loadConfirmCount()
     this.loadFinishCount()
     this.initView()
@@ -199,9 +193,14 @@ export default {
           this.finishRatioColor = this.getFinishedRatioColor(this.details.finished_ticket_ratio)
           // 字典值解析
           const departmentValue = this.details.department
-          this.details.department = this.resolveDepartmentDictionary(departmentValue)
+          this.details.department = this.$appdata.getDictionaryList('departmentMap')[departmentValue].label
           const modelInChargeValue = this.details.model_in_charge
-          this.details.model_in_charge = this.resolveDepartmentDictionary(modelInChargeValue)
+          const modelDictionary = this.$appdata.getDictionaryList('serviceModuleType')
+          for (let i = 0; i < modelDictionary.length; i++) {
+            if (modelInChargeValue === modelDictionary[i].value) {
+              this.details.model_in_charge = this.$appdata.getDictionaryList('serviceModuleType')[i].label
+            }
+          }
           this.finishedRatioLoadStatus = 'success'
           this.loadTicketDetails = false
         }, err => {
@@ -209,40 +208,6 @@ export default {
           console.error(err)
         })
     },
-    // 获取部门名字典
-    getDepartmentDictionary () {
-      return post(EmployeeDetailsViewApi.getDepartmentDictionary)
-        .then(res => {
-          this.departmentDictionary = res
-        }, err => {
-          console.log(err)
-        })
-    },
-    // 解析部门名字典
-    resolveDepartmentDictionary (key) {
-      for (let i = 0; i < this.departmentDictionary.length; i++) {
-        if (this.departmentDictionary[i].value == key) {
-          return this.departmentDictionary[i].name
-        }
-      }
-    },
-    // 获取模块名字典
-    getModelDictionary () {
-      return post(EmployeeDetailsViewApi.getModelDictionary)
-        .then(res => {
-          this.modelDictionary = res
-        }, err => {
-          console.log(err)
-        })
-    },
-    // 解析模块名字典
-    resolveModelDictionary (key) {
-      for (let i = 0; i < this.modelDictionary.length; i++) {
-        if (this.modelDictionary[i].value == key) {
-          return this.modelDictionary[i].name
-        }
-      }
-    },
     // 获取应答订单数量
     loadConfirmCount () {
       this.confirmSumWeekly = []