wms / wms4 · Commits

Commit 1f7c50d1520672a1fde6139a5689696c3a5332aa

Authored by 谭毅彬
1 parent 50afade4

入库单页面，出库单页面单据审核BUG修复 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 3 changed files with 36 additions and 37 deletions
ant-design-vue-jeecg/src/views/system/flow/FlowProcess.vue
  View file @1f7c50d
... ... @@ -18,40 +18,39 @@
18 18 <span style="color: rgba(0, 0, 0, 0.85)">创建时间：{{flowInfo.createTime}}</span>
19 19 </a-col>
20 20 </a-row>
21   -
22   - <a-card :bordered="false" title="流程进度">
23   - <a-steps style="margin-right: 14px;" :direction="isMobile() && 'vertical' || 'horizontal'" :current="flowInfo.seq-1" progressDot>
24   - <a-step v-for="(sa,index) in flowInfo.list" :title="sa.auditor">
25   - <div style="fontSize: 12px; color: rgba(0, 0, 0, 0.45); position: relative; left:8px;"
26   - slot="description">
27   - <div v-if="sa.sequence=='0'&&sa.status=='1'" style="margin: 8px 0 4px;font-size:16px;" >
28   - 创建单据
29   - </div>
30   - <div v-if="sa.status=='1'&&index!=flowInfo.list.length-1&&sa.sequence!='0'" style="margin: 8px 0 4px;font-size:16px;color: #00DB00">
31   - 审核通过
32   - </div>
33   - <div v-if="sa.status=='2'" style="margin: 8px 0 4px;font-size:16px;color: red">
34   - 审核驳回
35   - </div>
36   - <div v-if="sa.status=='0'" style="margin: 8px 0 4px;font-size:16px;color:lightseagreen">
37   - 待审核
38   - </div>
39   - <div v-if="sa.status=='1'&&index==flowInfo.list.length-1" style="margin: 8px 0 4px;font-size:16px;color: #50bfff">
40   - 审核完成
41   - </div>
42   - <div v-if="sa.remark!=null&&sa.remark!=''" style="margin: 8px 0 4px">
43   - 备注:{{sa.remark}}
44   - </div>
45   - <div v-if="sa.updateTime==null" style="margin: 8px 0 4px">
46   - 时间:{{sa.createTime}}
47   - </div>
48   - <div v-if="sa.updateTime!=null" style="margin: 8px 0 4px">
49   - 时间:{{sa.updateTime}}
50   - </div>
  21 + <a-card :bordered="false" title="流程进度">
  22 + <a-steps style="margin-right: 14px;" :direction="isMobile() && 'vertical' || 'horizontal'" :current="flowInfo.seq-1" progressDot>
  23 + <a-step v-for="(sa,index) in flowInfo.list" :key="index" :title="sa.auditor">
  24 + <div style="fontSize: 12px; color: rgba(0, 0, 0, 0.45); position: relative; left:8px;"
  25 + slot="description">
  26 + <div v-if="sa.sequence=='0'&&sa.status=='1'" style="margin: 8px 0 4px;font-size:16px;" >
  27 + 创建单据
  28 + </div>
  29 + <div v-if="sa.status=='1'&&index!=flowInfo.list.length-1&&sa.sequence!='0'" style="margin: 8px 0 4px;font-size:16px;color: #00DB00">
  30 + 审核通过
  31 + </div>
  32 + <div v-if="sa.status=='2'" style="margin: 8px 0 4px;font-size:16px;color: red">
  33 + 审核驳回
  34 + </div>
  35 + <div v-if="sa.status=='0'" style="margin: 8px 0 4px;font-size:16px;color:lightseagreen">
  36 + 待审核
  37 + </div>
  38 + <div v-if="sa.status=='1'&&index==flowInfo.list.length-1" style="margin: 8px 0 4px;font-size:16px;color: #50bfff">
  39 + 审核完成
  40 + </div>
  41 + <div v-if="sa.remark!=null&&sa.remark!=''" style="margin: 8px 0 4px">
  42 + 备注:{{sa.remark}}
  43 + </div>
  44 + <div v-if="sa.updateTime==null" style="margin: 8px 0 4px">
  45 + 时间:{{sa.createTime}}
  46 + </div>
  47 + <div v-if="sa.updateTime!=null" style="margin: 8px 0 4px">
  48 + 时间:{{sa.updateTime}}
51 49 </div>
52   - </a-step>
53   - </a-steps>
54   - </a-card>
  50 + </div>
  51 + </a-step>
  52 + </a-steps>
  53 + </a-card>
55 54 </div>
56 55 </a-card>
57 56 </j-modal>
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
  View file @1f7c50d
... ... @@ -184,8 +184,8 @@
184 184 <a-dropdown>
185 185 <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
186 186 <a-menu slot="overlay">
187   - <a-menu-item >
188   - <a v-if="record.firstStatus > 0 && flowOff=='1'" @click="openProcess(record)" type="primary">审核进度</a>
  187 + <a-menu-item v-if="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'">
  188 + <a @click="openProcess(record)" type="primary">审核进度</a>
189 189 </a-menu-item>
190 190 <a-menu-item v-has="'receiptHeader:edit'">
191 191 <a @click="handleEdit(record)">编辑</a>
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
  View file @1f7c50d
... ... @@ -199,8 +199,8 @@
199 199 <a-dropdown>
200 200 <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
201 201 <a-menu slot="overlay">
202   - <a-menu-item >
203   - <a v-if="record.firstStatus > 0 && flowOff=='1'" @click="openProcess(record)" type="primary">审核进度</a>
  202 + <a-menu-item v-if="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'">
  203 + <a @click="openProcess(record)" type="primary">审核进度</a>
204 204 </a-menu-item>
205 205 <a-menu-item v-has="'shipmentHeader:edit'">
206 206 <a @click="handleEdit(record)">编辑</a>
... ...