vue2-client 1.15.26 → 1.15.28

package/src/components/HeightScanner/index.vue

@@ -8,7 +8,7 @@
     @cancel="handleCancel"
     :maskClosable="false"
   >
-    <div class="scanner-container">
+    <div class="scanner-container" >
       <a-row>
         <a-space>
           <a-button type="primary" @click="capturePhoto">拍照</a-button>
@@ -19,6 +19,7 @@
           <a-button type="primary" @click="openApp">开启程序</a-button>
           <a-button v-if="showid" type="primary" @click="startReadCard">读身份证</a-button>
           <a-button v-if="showid" @click="stopReadCard">停止读卡</a-button>
+          <a-button type="primary" @click="rotateCamera">画面旋转</a-button>
         </a-space>
       </a-row>
       <a-row>
@@ -43,12 +44,15 @@
             :disabled="true"></a-textarea>
         </a-col>
         <a-col :span="24">
-          <img
-            id="cam"
-            :src="cameraurl"
-            width="100%"
-            height="540"
-            alt=""/>
+          <div
+            :style="{...heightStyle, display: 'flex', justifyContent: 'center', alignItems: 'center'}">
+            <img
+              id="cam"
+              :src="cameraurl"
+              :style="rotateStyle"
+              class="video"
+              alt=""/>
+          </div>
         </a-col>
         <a-col :span="24" v-if="showid">
           <a-form layout="horizontal">
@@ -145,9 +149,11 @@ export default {
       },
       callback: {},
       context: 0,
+      rotateAngle: 0,
       base_offset: 0,
       orgdrawwidth: 0,
       orgdrawheight: 0,
+      containerHeight: 440,
 
       CLT_MSG: {
         // 打开相机 cap:相机ID
@@ -234,8 +240,29 @@ export default {
       }
     }
   },
-
+  computed: {
+    rotateStyle () {
+      return {
+        transform: `rotate(${this.rotateAngle}deg)`,
+        transition: 'transform 0.5s ease',
+        maxHeight: `${this.rotateAngle % 180 === 0 ? '440px' : '660px'}`
+      }
+    },
+    heightStyle () {
+      return {
+        width: '100%',
+        height: `${this.containerHeight}px`,
+      }
+    }
+  },
   methods: {
+    rotateCamera () {
+      console.log('>>> 旋转镜头')
+      // 每次点击增加 90 度，超过 360 度时归零
+      this.rotateAngle = (this.rotateAngle + 90) % 360
+      // 根据旋转角度设置不同的高度
+      this.containerHeight = this.rotateAngle % 180 === 0 ? 440 : 660
+    },
     // handleImgError (e) {
     //   e.target.style.display = 'none'
     // },
@@ -419,14 +446,20 @@ export default {
         return
       }
       const param = {
-        camidx: camidx
+        camidx: camidx,
+        image_process_info: {
+          cut_type: '0',
+          multi_object: '0',
+          rotate: `${this.rotateAngle}`,
+        },
       }
       const msg = await this.newInstancePost('http://127.0.0.1:38088/video=grabimage', param)
       if (msg.data.code != '0') {
         this.$message.info(msg.data.message)
         return
       }
-      this.previewImage = 'data:image/jpg;base64,' + msg.data.photoBase64
+      console.log('msg========================>', msg)
+      this.previewImage = 'data:image/jpg;base64,' + msg.data.images[0].base64
       this.output('base64 长度 : ' + this.previewImage)
       this.$emit('photo-finish', { img: this.previewImage })
       this.name = ''
@@ -569,3 +602,14 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+.video {
+  width: 70%;
+  height: 440px;
+  display: flex;
+  flex-direction: column;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+</style>

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,47 +1,211 @@
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="我的工单"
+      ref="xFormTable"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="addApply">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail
+      ref="workFlow"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+    <!--  协议作废功能  -->
+    <a-modal
+      v-model="formState"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="作废"
+      :destroyOnClose="true"
+      width="55vw">
+      <x-add-native-form
+        ref="xCancelForm"
+        @onSubmit="submit"
+      />
+      <template #footer>
+        <a-button key="back" @click="formState = false">取消</a-button>
+        <a-button key="submit" type="primary" :loading="submitLoading" @click="formSubmit">确认</a-button>
+      </template>
+    </a-modal>
+  </a-card>
+</template>
+
 <script>
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
 
 export default {
-  name: 'WorkFlowDemo',
-  components: { WorkflowDetail },
-  mounted () {
-    this.$refs.workFlow.init({
-      workflowId: '376'
-    })
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail,
+    AddressSelect
+  },
+  provide () {
+    return {
+      generalFunction: {
+        setCancel: this.setCancel,
+        updateFormData: this.updateFormData,
+      }
+    }
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ApplyProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      formState: false,
+      submitLoading: false,
+      cancelRecord: {}
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
   },
   methods: {
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId
-     */
-    success ({ note, form, workflowId }) {
-      console.log('success', note, form, workflowId)
-    },
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId 工作流id
-     * @param fromStepId 起ID
-     * @param toStepId 往ID
-     * @param successStepId 完成步骤id
-     * @param successStep 完成步骤名称
-     * @param fromStep 起步骤名称
-     * @param toStep 往步骤名称
-     */
-    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
-      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
+    addApply () {
+      console.log('打开了吗')
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.$refs.xFormTable.refreshTable(true)
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.ab_f_workflow_id,
+      })
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+      if (func === 'selectAddress') {
+        this.$refs.addressSelect.setFormShow()
+      }
+    },
+    setForm (record) {
+      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
+    },
+    nextClick ({ form, formStep, workflowId }) {
+      console.log('success', form, formStep, workflowId)
+      const data = {
+        workflowId,
+        form,
+        formStep
+      }
+      runLogic('applySubmitAfter', data, 'af-apply').then(
+        res => {
+          if (res) {
+            // this.$message.success('提交成功！')
+            this.$refs.xFormTable.refreshTable(true)
+          }
+        }
+      )
+    },
+    // 协议作废
+    setCancel (record) {
+      this.cancelRecord = record
+      this.formState = true
+      this.$nextTick(() => {
+        getConfigByName('setCancelForm', 'af-apply', (config) => {
+          if (this.$refs.xCancelForm) {
+            this.$refs.xCancelForm.init({
+              formItems: config.formJson,
+              title: '补充协议作废',
+              businessType: '修改',
+              showSubmitBtn: false,
+              ...config
+            })
+            if (this.$refs.xCancelForm) {
+              console.log(record)
+              // this.$refs.xCancelForm.setForm(recordData)
+            }
+          } else {
+            console.error('xCancelForm组件未加载完成')
+            // 延迟重试
+            setTimeout(() => {
+              this.setCancel(record)
+            }, 100)
+          }
+        })
+      })
+    },
+    async formSubmit () {
+      this.submitLoading = true
+      const formData = await this.$refs.xCancelForm.asyncSubmit()
+      try {
+        await this.submit(formData)
+      } catch (error) {
+        this.$message.error('表单验证失败，请检查填写内容')
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    async submit (formData) {
+      const data = {
+        ...formData,
+      }
+      console.log('==formData', data)
+      await runLogic('暂时没有实现的logic', data, 'af-apply').then(() => {
+        this.$message.success('操作成功')
+        this.formState = false
+      })
+    },
+    updateFormData (workflowId) {
+      runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
+        console.log('>>>> res==', res)
+        this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: 1200 })
+      })
+      console.log()
     }
   }
 }
 </script>
-
-<template>
-  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
-</template>
-
-<style scoped lang="less">
-
-</style>

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -1,204 +1,132 @@
 <template>
   <a-card :bordered="false">
-    <x-form-table
-      title="我的工单"
-      ref="xFormTable"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      @action="toDetail">
-      <template slot="button">
-        <a-button @click="addApply">
-          <a-icon type="plus"/>
-          发起报建
-        </a-button>
-      </template>
-    </x-form-table>
-    <a-modal
-      v-model="applyAddFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="发起报建"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
-    </a-modal>
-    <WorkflowDetail
-      ref="workFlow"
-      @success="success"
-      @nextClick="nextClick"
-      @x-form-item-emit-func="handleFormItemEvent"
-    >
-    </WorkflowDetail>
-    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
-    <!--  协议作废功能  -->
-    <a-modal
-      v-model="formState"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="作废"
-      :destroyOnClose="true"
-      width="55vw">
-      <x-add-native-form
-        ref="xCancelForm"
-        @onSubmit="submit"
-      />
-      <template #footer>
-        <a-button key="back" @click="formState = false">取消</a-button>
-        <a-button key="submit" type="primary" :loading="submitLoading" @click="formSubmit">确认</a-button>
-      </template>
-    </a-modal>
+    <a-tabs default-active-key="1">
+      <!-- 业务审核 Tab -->
+      <a-tab-pane key="1" tab="业务审核">
+        <x-form-table
+          title="业务审核"
+          :queryParamsName="queryParamsName"
+          :fixedAddForm="fixedAddForm"
+          :fixedQueryForm="fixedQueryForm"
+          @audit="audit"
+          serviceName="af-revenue"
+          ref="xFormTable">
+        </x-form-table>
+        <WorkflowDetail ref="workFlow" @success="confirmAudit" @nextClick="nextClick"></WorkflowDetail>
+      </a-tab-pane>
+
+      <!-- 我负责的 Tab -->
+      <a-tab-pane key="2" tab="我参与的">
+        <x-form-table
+          title="我参与的业务"
+          :queryParamsName="queryParamsName2"
+          :fixedQueryForm="fixedQueryForm2"
+          @check="check"
+          serviceName="af-revenue"
+          ref="xFormTable">
+        </x-form-table>
+      </a-tab-pane>
+    </a-tabs>
   </a-card>
 </template>
 
 <script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
 import { mapState } from 'vuex'
-import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
+import { runLogic } from '@vue2-client/services/api/common'
 
 export default {
-  name: 'Apply',
+  name: 'UnitManage',
   components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail,
-    AddressSelect
-  },
-  provide () {
-    return {
-      generalFunction: {
-        setCancel: this.setCancel,
-      }
-    }
+    XFormTable, XDescriptions, XAddNativeForm, WorkflowDetail
   },
   data () {
     return {
-      // 查询配置文件名
-      queryParamsName: 'ApplyProcessCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false,
-      formState: false,
-      submitLoading: false,
-      cancelRecord: {}
+      // 查询配置名称
+      queryParamsName: 'businessAuditCRUD',
+      queryParamsName2: 'participatedCRUD',
+      // 新增表单固定值
+      fixedAddForm: {},
+      fixedQueryForm: {},
+      fixedQueryForm2: {},
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // 是否显示详情抽屉
+      detailVisible: false
     }
   },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
+  created () {
+  },
+  mounted () {
+    this.fixedQueryForm = {
+      ws_f_handler: this.currUser.name
+    }
+    this.fixedQueryForm2 = {
+      a_f_handler: this.currUser.name
+    }
   },
   methods: {
-    addApply () {
-      console.log('打开了吗')
-      this.applyAddFlag = true
-      this.$nextTick(
-        () => {
-          getConfigByName('addApplyForm', 'af-apply', (res) => {
-            this.$refs.xForm.init({
-              businessType: '新增',
-              title: '发起报建',
-              ...res
-            })
-          })
-        }
-      )
-    },
-    applySubmit (formData) {
-      runLogic('addApply', formData).then(
-        res => {
-          this.$message.success('发起报建成功')
-          this.$refs.xFormTable.refreshTable(true)
-          this.applyAddFlag = false
-        }
-      ).catch(() => {
-        this.applyAddFlag = false
-      })
-    },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id,
-        stepId: record.ws_f_step_id
-      })
-    },
-    handleFormItemEvent (func, data, value) {
-      console.log('打印一下：', func, data, value)
-      if (func === 'selectAddress') {
-        this.$refs.addressSelect.setFormShow()
-      }
-    },
-    setForm (record) {
-      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
-    },
     nextClick ({ form, formStep, workflowId }) {
       console.log('success', form, formStep, workflowId)
-      const data = {
-        workflowId,
-        form,
-        formStep
+      if (formStep === '管理员审核') {
+        const data = {
+          workflowId,
+          form
+        }
+        runLogic('auditFinish', { data: data }, 'af-revenue').then(
+          res => {
+            if (res) {
+              this.$message.success('审核完成！！！')
+              this.formModalVisible = false
+              this.$refs.xFormTable.refreshTable(true)
+            }
+          }
+        )
       }
-      runLogic('applySubmitAfter', data, 'af-apply').then(
+    },
+    confirmAudit (param) {
+      runLogic('auditFinish', { data: param }, 'af-revenue').then(
         res => {
           if (res) {
-            // this.$message.success('提交成功！')
+            this.$message.success('审核完成！！！')
+            this.formModalVisible = false
             this.$refs.xFormTable.refreshTable(true)
           }
         }
       )
     },
-    // 协议作废
-    setCancel (record) {
-      this.cancelRecord = record
-      this.formState = true
-      this.$nextTick(() => {
-        getConfigByName('setCancelForm', 'af-apply', (config) => {
-          if (this.$refs.xCancelForm) {
-            this.$refs.xCancelForm.init({
-              formItems: config.formJson,
-              title: '补充协议作废',
-              businessType: '修改',
-              showSubmitBtn: false,
-              ...config
-            })
-            if (this.$refs.xCancelForm) {
-              console.log(record)
-              // this.$refs.xCancelForm.setForm(recordData)
-            }
-          } else {
-            console.error('xCancelForm组件未加载完成')
-            // 延迟重试
-            setTimeout(() => {
-              this.setCancel(record)
-            }, 100)
-          }
-        })
+    audit (record, id, type) {
+      console.log(record, id, type)
+      console.log(this.$refs.workFlow)
+      this.detailVisible = true
+      this.$refs.workFlow.init({
+        workflowId: record.w_id
       })
     },
-    async formSubmit () {
-      this.submitLoading = true
-      const formData = await this.$refs.xCancelForm.asyncSubmit()
-      try {
-        await this.submit(formData)
-      } catch (error) {
-        this.$message.error('表单验证失败，请检查填写内容')
-      } finally {
-        this.submitLoading = false
-      }
-    },
-    async submit (formData) {
-      const data = {
-        ...formData,
-      }
-      console.log('==formData', data)
-      await runLogic('暂时没有实现的logic', data, 'af-apply').then(() => {
-        this.$message.success('操作成功')
-        this.formState = false
+    check (record, id, type) {
+      console.log(record, id, type)
+      console.log(this.$refs.workFlow)
+      this.detailVisible = true
+      this.$refs.workFlow.init({
+        workflowId: record.a_id
       })
+    },
+    onClose () {
+      this.detailVisible = false
     }
-  }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
 }
 </script>
+
+<style scoped lang="less">
+:deep(.ant-statistic-content-value) {
+  color: @primary-color;
+}
+</style>