vue2-client 1.2.69 → 1.2.72

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -121,7 +121,7 @@
       <a-select
         v-if="!attr.lazyLoad || attr.lazyLoad === 'false'"
         v-model="form[attr.model]"
-        :disabled="disabled || !selectsArray[attr.group] || !selectsArray[attr.group][attr.groupIndex] || (selectsArray[attr.group][attr.groupIndex] && selectsArray[attr.group][attr.groupIndex].length === 0)"
+        :disabled=" attr.groupIndex>1 && (disabled || !selectsArray[attr.group] || !selectsArray[attr.group][attr.groupIndex] || (selectsArray[attr.group][attr.groupIndex] && selectsArray[attr.group][attr.groupIndex].length === 0))"
         @change="selectsItemCheck(attr.group, attr.groupIndex, form[attr.model])"
         show-search
         :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "

package/src/base-client/components/system/QueryParamsDetailsView/QueryParamsDetailsView.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <a-drawer
+      ref="QueryParamsDetailsView"
       title="查询配置详情"
       placement="right"
       :width="isMobile ? screenWidth : screenWidth * 0.85"
@@ -8,10 +9,19 @@
       @close="onClose"
     >
       <create-query
-        :to-edit-json="getColumnJson()"
+        :to-edit-json="editJson"
         :visible.sync="createQueryVisible"
         @saveQueryParams="saveQueryParams"
       />
+      <a-modal
+        title="导入JSON配置"
+        :visible="importJsonVisible"
+        @ok="importJsonHandleOk"
+        :getContainer="getContainer"
+        @cancel="importJsonVisible = false"
+      >
+        <a-textarea v-model="ImportEditJson" placeholder="输入现有的JSON配置"/>
+      </a-modal>
       <a-spin :spinning="loadDetails">
         <a-page-header :title="details.f_name+(details.f_remark ? '（' + details.f_remark + '）' : '')">
           <div class="row">
@@ -40,11 +50,17 @@
             </a-tabs>
             <div v-if="!loadDetails">
               <div v-if="tabActiveKey === '1'">
-                <a-button type="primary" @click="toCreateQuery">
-                  <a-icon :style="iconStyle" type="api"/>编辑查询配置
-                </a-button>
+                <a-space>
+                  <a-button type="primary" @click="toCreateQuery">
+                    <a-icon :style="iconStyle" type="edit"/>编辑查询配置
+                  </a-button>
+                  <a-button type="primary" @click="importJsonVisible = true">
+                    <a-icon :style="iconStyle" type="api"/>导入查询配置
+                  </a-button>
+                </a-space>
+
                 <a-card title="查询配置预览" :bordered="true" size="small" style="margin-top: 20px;">
-                  <json-viewer :copyable="{copyText: '复制', copiedText: '已复制'}" :value="getColumnJson()" :expand-depth="parseInt('100')" style="overflow: auto;max-height: 440px"></json-viewer>
+                  <json-viewer :copyable="{copyText: '复制', copiedText: '已复制'}" :value="editJson" :expand-depth="parseInt('100')" style="overflow: auto;max-height: 440px"></json-viewer>
                 </a-card>
               </div>
             </div>
@@ -89,6 +105,12 @@ export default {
         f_input_date: '',
         f_inputtor: ''
       },
+      // 查询表单配置json
+      editJson: {},
+      ImportEditJson: '',
+      // importJsonVisible
+      // 导入json对话框
+      importJsonVisible: false,
       tabList: [
         { key: '1', tab: '编辑查询配置' }
       ],
@@ -115,20 +137,28 @@ export default {
     }
   },
   methods: {
+    // 获取model渲染上下文
+    getContainer () {
+      // return document.getElementById('QueryParamsDetailsView')
+      return this.$refs.QueryParamsDetailsView.$el
+    },
     // 初始化组件
     initView () {
       this.tabActiveKey = '1'
+      this.editJson = {}
       this.getDetails(this.id)
     },
     toCreateQuery () {
       this.createQueryVisible = true
     },
-    getColumnJson () {
-      if (this.details.f_content) {
-        return JSON.parse(this.details.f_content)
-      } else {
-        return {}
+    importJsonHandleOk () {
+      try {
+        const temp = JSON.parse(this.ImportEditJson)
+        this.editJson = temp
+      } catch (e) {
+        this.$message.warn('操作失败，输入配置不是JSON格式')
       }
+      this.importJsonVisible = false
     },
     onClose () {
       this.$emit('update:visible', false)
@@ -141,6 +171,9 @@ export default {
       }).then(res => {
         this.details = res
         this.loadDetails = false
+        if (this.details.f_content) {
+          this.editJson = JSON.parse(this.details.f_content)
+        }
       }, err => {
         this.loadDetails = false
         console.error(err)

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

@@ -14,39 +14,53 @@
       @cancel="handleTransferCancel"
       :zIndex="1001"
     >
-      <a-input placeholder="请输入要转移工单的员工名" v-model="transferTo" @blur="checkEmp" @change="inputChange"/>
-      <div class="nameOptions" v-show="nameOptionsVisible">
-        <p class="nameOptionsItem" v-for="(item,index) in nameOptionsForChoose" :key="index" @click="chooseName(item.name)">{{ item.name }}</p>
-      </div>
-      <span v-if="!transferCheck" style="color: red">您输入的员工不存在，请检查后再试</span>
-      <span v-else style="color: green">您输入的员工已确认，可以进行工单转移</span>
-      <a-form-model-item label="留言">
-        <a-input v-model="note" type="textarea" />
-      </a-form-model-item>
-      <div class="clearfix">
-        <a-upload
-          name="avatar"
-          list-type="picture-card"
-          :before-upload="beforeUpload"
-          action="/webmeteruploadapi/upload"
-          :file-list="fileList"
-          @preview="handlePreview"
-          @change="handleChange"
-          :remove="remove"
-        >
-          <div v-if="fileList.length < 5">
-            <a-icon type="plus" />
-            <div class="ant-upload-text">点击上传</div>
+      <a-form-model ref="transmitFormRef" :label-col="{ span: 4 }" :wrapper-col="{ span: 16 }" :model="transmitForm" :rules="{ transferTo: { required: true, message: '移交人必填' }, note: { required: true, message: '备注不能为空' } }">
+        <a-form-model-item label="移交给" prop="transferTo">
+          <a-select
+            v-model="transmitForm.transferTo"
+            placeholder="请输入移交人"
+            :show-arrow="false"
+            :filter-option="false"
+            :not-found-content="null"
+            :options="nameOptionsFiltered"
+            show-search
+            style="width: 150px"
+            @search="employeeNameSearch" />
+        </a-form-model-item>
+        <a-form-model-item label="留言" prop="note">
+          <a-textarea v-model="transmitForm.note" :rows="3" placeholder="请输入移交留言" />
+        </a-form-model-item>
+        <a-form-model-item label="上传图片">
+          <div class="clearfix">
+            <a-upload
+              name="avatar"
+              list-type="picture-card"
+              :before-upload="beforeUpload"
+              action="/webmeteruploadapi/upload"
+              :file-list="fileList"
+              @preview="handlePreview"
+              @change="handleChange"
+              :remove="remove"
+            >
+              <div v-if="fileList.length < 5">
+                <a-icon type="plus" />
+                <div class="ant-upload-text">点击上传</div>
+              </div>
+            </a-upload>
           </div>
-        </a-upload>
-        <a-modal
-          :visible="previewVisible"
-          :footer="null"
-          @cancel="handleCancel"
-        >
-          <img style="width: 100%" :src="previewImage" alt="图片上传"/>
-        </a-modal>
-      </div>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+    <!-- 图片预览弹框 -->
+    <a-modal
+      :visible="previewVisible"
+      :footer="null"
+      :z-index="1001"
+      :dialog-style="{ top: '30px' }"
+      width="90%"
+      @cancel="handleCancel"
+    >
+      <img style="width: 100%" :src="previewImage" alt="上传图片"/>
     </a-modal>
     <!--  关闭工单确认框  -->
     <a-modal
@@ -239,14 +253,13 @@
         selectedImageShow: false,
         // 当前步骤
         step: 0,
-        // 校验转移员工是否存在
-        transferCheck: false,
         // 移交工单窗口可见性
         transVisible: false,
-        // 转移工单对象
-        transferTo: '',
-        // 新增留言
-        note: '',
+        // 移交表单
+        transmitForm: {
+          transferTo: undefined,
+          note: ''
+        },
         // 控制关闭订单按钮可用性
         disableCloseBtn: false,
         // 控制关闭工单确认框显示
@@ -261,10 +274,8 @@
         timer: undefined,
         // 所有员工姓名
         nameOptions: [],
-        // 员工姓名备选
-        nameOptionsForChoose: [],
-        // 员工姓名备选项显示控制
-        nameOptionsVisible: false,
+        // 结果筛选的员工信息
+        nameOptionsFiltered: [],
         // 工单流转抽屉可见性
         workFlowVisible: false,
         // 控制小加载指示物显示
@@ -275,8 +286,6 @@
         descriptionLoading: false,
         // 用于刷新按钮倒计时显示
         btnCountdownText: 5,
-        // 当前登陆用户在数据库表中id，临时使用，之后会替换
-        empIdInDataBase: undefined
       }
     },
     mounted () {
@@ -300,23 +309,12 @@
       this.stopTimer()
     },
     methods: {
-      // 转移员工姓名change事件，用于展示备选
-      inputChange () {
-        if (this.transferTo.length === 0) {
-          this.nameOptionsVisible = false
-        } else {
-          this.nameOptionsVisible = true
-          var inputName = this.transferTo
-          this.nameOptionsForChoose = this.nameOptions.filter(function (element) {
-            return element.name.indexOf(inputName) !== -1
-          })
+      employeeNameSearch (input) {
+        if (!input) {
+          this.nameOptionsFiltered = []
+          return
         }
-      },
-      // 在候选框中点击了名称
-      chooseName (name) {
-        this.nameOptionsVisible = false
-        this.transferTo = name
-        this.checkEmp()
+        this.nameOptionsFiltered = this.nameOptions.filter(item => item.name.includes(input)).map(item => ({ label: item.name, value: item.id }))
       },
       // 获取所有员工名，供输入框备选
       getAllEmpNames () {
@@ -495,11 +493,10 @@
       },
       // 确认工单按钮业务逻辑
       confirmTicketBtn () {
-        this.getCurrentEmpId()
         return post(TicketDetailsViewApi.confirmTicket, {
           ticketId: this.ticketId,
           time: this.format(new Date(), 'yyyy-MM-dd hh:mm:ss'),
-          empId: this.empIdInDataBase
+          empId: this.currUser.id
         })
           .then(res => {
             if (res !== 0) {
@@ -514,32 +511,10 @@
             this.initView()
           })
       },
-      // 获取当前登陆员工ID
-      getCurrentEmpId () {
-        return post(EmployeeDetailsViewApi.getEmployeeId, {
-          name: this.currUser.ename
-        })
-          .then(res => {
-            this.empIdInDataBase = res
-          }, err => {
-            console.log(err)
-          })
-      },
       // 转移工单按钮业务逻辑
       transferBtn () {
         this.transVisible = true
       },
-      checkEmp () {
-        return post(EmployeeDetailsViewApi.findEmpName, {
-          empName: this.transferTo
-        })
-          .then(res => {
-            const num = res
-            this.transferCheck = num !== 0
-          }, err => {
-            console.error(err)
-          })
-      },
       // 获取工单状态撤销or关闭
       getStatus () {
         if (this.details.status === 2) {
@@ -554,22 +529,15 @@
       },
       // 转移工单确认后逻辑
       handleTransferOk () {
-        if (!this.transferCheck) {
-          this.$message.error(
-            '请先检查您输入的员工名',
-            2
-          )
-        } else {
-          return post(TicketDetailsViewApi.transferTicketToOthers, {
+        this.$refs['transmitFormRef'].validate().then(() => {
+          post(TicketDetailsViewApi.transferTicketToOthers, {
             ticketId: this.ticketId,
             endTime: this.format(new Date(), 'yyyy-MM-dd hh:mm:ss'),
-            transferTo: this.transferTo,
-            note: this.note,
+            ...this.transmitForm,
             images: this.fileList
           })
             .then(res => {
               const result = res
-              this.note = ''
               this.transVisible = false
               if (result === 1) {
                 this.$message.success(
@@ -577,9 +545,7 @@
                   5
                 )
                 this.fileList = []
-                this.transferTo = ''
-                this.transferCheck = false
-                this.initView()
+                this.$refs['transmitFormRef'].resetFields()
               } else {
                 this.$message.error('工单已被他人处理或关闭，请刷新再试', 5)
               }
@@ -589,14 +555,12 @@
               console.error(err)
               this.transVisible = false
             })
-        }
+        })
       },
       // 转移工单取消后逻辑
       handleTransferCancel () {
         this.transVisible = false
-        this.transferCheck = false
-        this.transferTo = ''
-        this.note = ''
+        this.$refs['transmitFormRef'].resetFields()
       },
       // 关闭抽屉时回调
       onClose () {
@@ -837,17 +801,4 @@
   z-index: 9998;
   background-color: rgba(0,0,0,0.7);
 }
-.nameOptionsItem {
-  padding-left: 5px;
-  margin-bottom: 2px;
-}
-.nameOptionsItem:hover {
-  background-color: rgb(209,233,255);
-}
-.nameOptionsItem:last-of-type {
-  margin-bottom: 0px;
-}
-.nameOptions {
-  border: rgba(0,0,0,0.4) solid 1px;
-}
 </style>

package/src/services/api/EmployeeDetailsViewApi.js

@@ -5,12 +5,8 @@ const EmployeeDetailsViewApi = {
   getConfirmTicketsCountWeekly: '/webmeterapi/getConfirmTicketsCountWeekly',
   // 查询：获取员工上一周完成工单数量
   getFinishedTicketsCountWeekly: '/webmeterapi/getFinishedTicketsCountWeekly',
-  // 查询：是否存在此员工
-  findEmpName: '/webmeterapi/findEmpName',
   // 查询：获取所有员工名，供前端展示备选项
   getAllEmployeeName: '/webmeterapi/getAllEmployeeName',
-  // 查询：根据员工名，获取员工id
-  getEmployeeId: '/webmeterapi/getEmployeeId'
 }
 
 export { EmployeeDetailsViewApi }