vue2-client 1.18.20 → 1.18.22

package/src/mock/goods/index.js

@@ -1,108 +1,108 @@
-import Mock from 'mockjs'
-import '@vue2-client/mock/extend'
-import { parseUrlParams } from '@vue2-client/utils/request'
-
-const current = new Date().getTime()
-
-const goodsList = Mock.mock({
-  'list|100': [{
-    'id|+1': 0,
-    name: '@GOODS',
-    orderId: `${current}-@integer(1,100)`,
-    'status|1-4': 1,
-    send: '@BOOLEAN',
-    sendTime: '@DATETIME',
-    orderDate: '@DATE',
-    auditTime: '@TIME'
-  }]
-})
-
-Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
-  const params = parseUrlParams(decodeURI(url))
-  let { page, pageSize } = params
-  // eslint-disable-next-line no-eval
-  page = eval(page) - 1 || 0
-  // eslint-disable-next-line no-eval
-  pageSize = eval(pageSize) || 10
-  delete params.page
-  delete params.pageSize
-  let result = goodsList.list.filter(item => {
-    for (const [key, value] of Object.entries(params)) {
-      if (item[key] !== value) {
-        return false
-      }
-    }
-    return true
-  })
-  const total = result.length
-  if ((page) * pageSize > total) {
-    result = []
-  } else {
-    result = result.slice(page * pageSize, (page + 1) * pageSize)
-  }
-  return {
-    code: 0,
-    message: 'success',
-    data: {
-      page: page + 1,
-      pageSize,
-      total,
-      list: result
-    }
-  }
-})
-
-const columnsConfig = [
-  {
-    title: '商品名称',
-    dataIndex: 'name',
-    searchAble: true
-  },
-  {
-    title: '订单号',
-    dataIndex: 'orderId'
-  },
-  {
-    searchAble: true,
-    dataIndex: 'status',
-    dataType: 'select',
-    slots: { title: 'statusTitle' },
-    scopedSlots: { customRender: 'status' },
-    search: {
-      selectOptions: [
-        { title: '已下单', value: 1 },
-        { title: '已付款', value: 2 },
-        { title: '已审核', value: 3 }
-        // {title: '已发货', value: 4}
-      ]
-    }
-  },
-  {
-    title: '发货',
-    searchAble: true,
-    dataIndex: 'send',
-    dataType: 'boolean',
-    scopedSlots: { customRender: 'send' }
-  },
-  {
-    title: '发货时间',
-    dataIndex: 'sendTime',
-    dataType: 'datetime'
-  },
-  {
-    title: '下单日期',
-    searchAble: true,
-    dataIndex: 'orderDate',
-    dataType: 'date',
-    visible: false
-  },
-  {
-    title: '审核时间',
-    dataIndex: 'auditTime',
-    dataType: 'time'
-  }
-]
-
-Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
-  return columnsConfig
-})
+import Mock from 'mockjs'
+import '@vue2-client/mock/extend'
+import { parseUrlParams } from '@vue2-client/utils/request'
+
+const current = new Date().getTime()
+
+const goodsList = Mock.mock({
+  'list|100': [{
+    'id|+1': 0,
+    name: '@GOODS',
+    orderId: `${current}-@integer(1,100)`,
+    'status|1-4': 1,
+    send: '@BOOLEAN',
+    sendTime: '@DATETIME',
+    orderDate: '@DATE',
+    auditTime: '@TIME'
+  }]
+})
+
+Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
+  const params = parseUrlParams(decodeURI(url))
+  let { page, pageSize } = params
+  // eslint-disable-next-line no-eval
+  page = eval(page) - 1 || 0
+  // eslint-disable-next-line no-eval
+  pageSize = eval(pageSize) || 10
+  delete params.page
+  delete params.pageSize
+  let result = goodsList.list.filter(item => {
+    for (const [key, value] of Object.entries(params)) {
+      if (item[key] !== value) {
+        return false
+      }
+    }
+    return true
+  })
+  const total = result.length
+  if ((page) * pageSize > total) {
+    result = []
+  } else {
+    result = result.slice(page * pageSize, (page + 1) * pageSize)
+  }
+  return {
+    code: 0,
+    message: 'success',
+    data: {
+      page: page + 1,
+      pageSize,
+      total,
+      list: result
+    }
+  }
+})
+
+const columnsConfig = [
+  {
+    title: '商品名称',
+    dataIndex: 'name',
+    searchAble: true
+  },
+  {
+    title: '订单号',
+    dataIndex: 'orderId'
+  },
+  {
+    searchAble: true,
+    dataIndex: 'status',
+    dataType: 'select',
+    slots: { title: 'statusTitle' },
+    scopedSlots: { customRender: 'status' },
+    search: {
+      selectOptions: [
+        { title: '已下单', value: 1 },
+        { title: '已付款', value: 2 },
+        { title: '已审核', value: 3 }
+        // {title: '已发货', value: 4}
+      ]
+    }
+  },
+  {
+    title: '发货',
+    searchAble: true,
+    dataIndex: 'send',
+    dataType: 'boolean',
+    scopedSlots: { customRender: 'send' }
+  },
+  {
+    title: '发货时间',
+    dataIndex: 'sendTime',
+    dataType: 'datetime'
+  },
+  {
+    title: '下单日期',
+    searchAble: true,
+    dataIndex: 'orderDate',
+    dataType: 'date',
+    visible: false
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'auditTime',
+    dataType: 'time'
+  }
+]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
+  return columnsConfig
+})

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -370,7 +370,7 @@ export default {
       }
       const activeStep = this.stepsForChild.find(item => item.id === this.activeStepId)
       // 如果当前选中节点不是正在进行的节点，则判断viewers权限
-      if (this.activeStepId !== this.currentStepId && activeStep != null && activeStep.status !== 1) {
+      if ((this.activeStepId !== this.currentStepId && activeStep != null && activeStep.status !== 1) || (this.details.f_state === 1 && this.activeStepId === this.currentStepId)) {
         // 历史节点为当前登录人操作则不做查看数据权限校验
         if (activeStep.handler === this.currUser.name) {
           return true

package/src/pages/dashboard/workplace/WorkPlace.vue

@@ -1,141 +1,141 @@
-<template>
-  <page-layout :avatar="currUser.avatar">
-    <div slot="headerContent">
-      <div class="title">{{ welcome.timeFix[lang] }}，{{ currUser.name }}，{{ welcome.message[lang] }}</div>
-      <div>{{ currUser.position[lang] }}</div>
-    </div>
-    <template slot="extra">
-      <head-info class="split-right" :title="$t('project')" content="56"/>
-      <head-info class="split-right" :title="$t('ranking')" content="8/24"/>
-      <head-info class="split-right" :title="$t('visit')" content="2,223"/>
-    </template>
-    <template>
-      <a-row style="margin: 0 -12px">
-        <a-col
-          style="padding: 0 12px"
-          :xl="16"
-          :lg="24"
-          :md="24"
-          :sm="24"
-          :xs="24">
-          <a-card
-            class="project-list"
-            :loading="loading"
-            style="margin-bottom: 24px;"
-            :bordered="false"
-            :title="$t('progress')"
-            :body-style="{padding: 0}">
-            <a slot="extra">{{ $t('all') }}</a>
-            <div>
-              <a-card-grid :key="i" v-for="(item, i) in projects">
-                <a-card :bordered="false" :body-style="{padding: 0}">
-                  <a-card-meta :description="item.desc">
-                    <div slot="title" class="card-title">
-                      <a-avatar size="small" :src="item.logo" />
-                      <span>Alipay</span>
-                    </div>
-                  </a-card-meta>
-                  <div class="project-item">
-                    <a class="group" href="/#/">科学搬砖组</a>
-                    <span class="datetime">9小时前</span>
-                  </div>
-                </a-card>
-              </a-card-grid>
-            </div>
-          </a-card>
-          <a-card :loading="loading" :title="$t('dynamic')" :bordered="false">
-            <a-list>
-              <a-list-item :key="index" v-for="(item, index) in activities">
-                <a-list-item-meta>
-                  <a-avatar slot="avatar" :src="item.user.avatar" />
-                  <div slot="title" v-html="item.template" />
-                  <div slot="description">9小时前</div>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>
-          </a-card>
-        </a-col>
-        <a-col
-          style="padding: 0 12px"
-          :xl="8"
-          :lg="24"
-          :md="24"
-          :sm="24"
-          :xs="24">
-          <a-card :title="$t('access')" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-            <div class="item-group">
-              <a>操作一</a>
-              <a>操作二</a>
-              <a>操作三</a>
-              <a>操作四</a>
-              <a>操作五</a>
-              <a>操作六</a>
-              <a-button size="small" type="primary" ghost icon="plus">{{ $t('add') }}</a-button>
-            </div>
-          </a-card>
-          <a-card :loading="loading" :title="`XX ${$t('degree')}`" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-            <div style="min-height: 400px;">
-              <radar />
-            </div>
-          </a-card>
-          <a-card :loading="loading" :title="$t('team')" :bordered="false">
-            <div class="members">
-              <a-row>
-                <a-col :span="12" v-for="(item, index) in teams" :key="index">
-                  <a>
-                    <a-avatar size="small" :src="item.avatar" />
-                    <span class="member">{{ item.name }}</span>
-                  </a>
-                </a-col>
-              </a-row>
-            </div>
-          </a-card>
-        </a-col>
-      </a-row>
-    </template>
-  </page-layout>
-</template>
-
-<script>
-import PageLayout from '@vue2-client/layouts/PageLayout'
-import HeadInfo from '@vue2-client/components/tool/HeadInfo'
-import Radar from '@vue2-client/components/chart/Radar'
-import { mapState } from 'vuex'
-import { teams } from '@vue2-client/mock/common'
-import { projectArr } from '@vue2-client/mock/project'
-import { welcome } from '@vue2-client/mock/user/current'
-import { activities } from '@vue2-client/mock/common/activityData'
-
-export default {
-  name: 'WorkPlace',
-  components: { Radar, HeadInfo, PageLayout },
-  i18n: require('./i18n'),
-  data () {
-    return {
-      projects: [],
-      loading: true,
-      activities: [],
-      teams: [],
-      welcome: {
-        timeFix: '',
-        message: ''
-      }
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['lang'])
-  },
-  created () {
-    this.activities = activities
-    this.welcome = welcome
-    this.teams = teams
-    this.projects = projectArr
-    this.loading = false
-  }
-}
-</script>
-
-<style lang="less">
-@import "index";
-</style>
+<template>
+  <page-layout :avatar="currUser.avatar">
+    <div slot="headerContent">
+      <div class="title">{{ welcome.timeFix[lang] }}，{{ currUser.name }}，{{ welcome.message[lang] }}</div>
+      <div>{{ currUser.position[lang] }}</div>
+    </div>
+    <template slot="extra">
+      <head-info class="split-right" :title="$t('project')" content="56"/>
+      <head-info class="split-right" :title="$t('ranking')" content="8/24"/>
+      <head-info class="split-right" :title="$t('visit')" content="2,223"/>
+    </template>
+    <template>
+      <a-row style="margin: 0 -12px">
+        <a-col
+          style="padding: 0 12px"
+          :xl="16"
+          :lg="24"
+          :md="24"
+          :sm="24"
+          :xs="24">
+          <a-card
+            class="project-list"
+            :loading="loading"
+            style="margin-bottom: 24px;"
+            :bordered="false"
+            :title="$t('progress')"
+            :body-style="{padding: 0}">
+            <a slot="extra">{{ $t('all') }}</a>
+            <div>
+              <a-card-grid :key="i" v-for="(item, i) in projects">
+                <a-card :bordered="false" :body-style="{padding: 0}">
+                  <a-card-meta :description="item.desc">
+                    <div slot="title" class="card-title">
+                      <a-avatar size="small" :src="item.logo" />
+                      <span>Alipay</span>
+                    </div>
+                  </a-card-meta>
+                  <div class="project-item">
+                    <a class="group" href="/#/">科学搬砖组</a>
+                    <span class="datetime">9小时前</span>
+                  </div>
+                </a-card>
+              </a-card-grid>
+            </div>
+          </a-card>
+          <a-card :loading="loading" :title="$t('dynamic')" :bordered="false">
+            <a-list>
+              <a-list-item :key="index" v-for="(item, index) in activities">
+                <a-list-item-meta>
+                  <a-avatar slot="avatar" :src="item.user.avatar" />
+                  <div slot="title" v-html="item.template" />
+                  <div slot="description">9小时前</div>
+                </a-list-item-meta>
+              </a-list-item>
+            </a-list>
+          </a-card>
+        </a-col>
+        <a-col
+          style="padding: 0 12px"
+          :xl="8"
+          :lg="24"
+          :md="24"
+          :sm="24"
+          :xs="24">
+          <a-card :title="$t('access')" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
+            <div class="item-group">
+              <a>操作一</a>
+              <a>操作二</a>
+              <a>操作三</a>
+              <a>操作四</a>
+              <a>操作五</a>
+              <a>操作六</a>
+              <a-button size="small" type="primary" ghost icon="plus">{{ $t('add') }}</a-button>
+            </div>
+          </a-card>
+          <a-card :loading="loading" :title="`XX ${$t('degree')}`" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
+            <div style="min-height: 400px;">
+              <radar />
+            </div>
+          </a-card>
+          <a-card :loading="loading" :title="$t('team')" :bordered="false">
+            <div class="members">
+              <a-row>
+                <a-col :span="12" v-for="(item, index) in teams" :key="index">
+                  <a>
+                    <a-avatar size="small" :src="item.avatar" />
+                    <span class="member">{{ item.name }}</span>
+                  </a>
+                </a-col>
+              </a-row>
+            </div>
+          </a-card>
+        </a-col>
+      </a-row>
+    </template>
+  </page-layout>
+</template>
+
+<script>
+import PageLayout from '@vue2-client/layouts/PageLayout'
+import HeadInfo from '@vue2-client/components/tool/HeadInfo'
+import Radar from '@vue2-client/components/chart/Radar'
+import { mapState } from 'vuex'
+import { teams } from '@vue2-client/mock/common'
+import { projectArr } from '@vue2-client/mock/project'
+import { welcome } from '@vue2-client/mock/user/current'
+import { activities } from '@vue2-client/mock/common/activityData'
+
+export default {
+  name: 'WorkPlace',
+  components: { Radar, HeadInfo, PageLayout },
+  i18n: require('./i18n'),
+  data () {
+    return {
+      projects: [],
+      loading: true,
+      activities: [],
+      teams: [],
+      welcome: {
+        timeFix: '',
+        message: ''
+      }
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['lang'])
+  },
+  created () {
+    this.activities = activities
+    this.welcome = welcome
+    this.teams = teams
+    this.projects = projectArr
+    this.loading = false
+  }
+}
+</script>
+
+<style lang="less">
+@import "index";
+</style>

package/src/pages/system/dictionary/index.vue

@@ -1,44 +1,44 @@
-<template>
-  <a-card :bordered="false">
-    <dictionary-details-view
-      v-if="selectId"
-      :id="selectId"
-      :visible.sync="detailVisible"
-    />
-    <x-form-table
-      serviceName="af-system"
-      :queryParamsName="queryParamsName"
-      title="字典"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-  import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
-
-  export default {
-    name: 'Dictionary',
-    components: {
-      XFormTable,
-      DictionaryDetailsView
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'crud_dictionary_manage',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <dictionary-details-view
+      v-if="selectId"
+      :id="selectId"
+      :visible.sync="detailVisible"
+    />
+    <x-form-table
+      serviceName="af-system"
+      :queryParamsName="queryParamsName"
+      title="字典"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+  import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
+
+  export default {
+    name: 'Dictionary',
+    components: {
+      XFormTable,
+      DictionaryDetailsView
+    },
+    data () {
+      return {
+        // 选中的编号
+        selectId: undefined,
+        // 查询配置文件名
+        queryParamsName: 'crud_dictionary_manage',
+        // 是否显示详情抽屉
+        detailVisible: false
+      }
+    },
+    methods: {
+      toDetail (record, id) {
+        this.selectId = id + ''
+        this.detailVisible = true
+      }
+    }
+  }
+</script>