wms / wms4 · Commits

Commit 124debbe41be0276c2d1dcc2fe7714642f372e4d

Authored by 谭毅彬
1 parent c3c95f1c

修正打包发布后页面无法正确加载问题(2) 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 11 changed files with 178 additions and 168 deletions
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
  View file @124debb
... ... @@ -225,7 +225,7 @@
225 225 </div>
226 226  
227 227 <simple-inventory-detail-modal ref="modalForm" @ok="modalFormOk"></simple-inventory-detail-modal>
228   - <quick-shipment-detail-model ref='quickShipmentModel' @ok="modalFormOk"></quick-shipment-detail-model>
  228 + <quick-shipment-detail-modal ref='quickShipmentDetailModal' @ok="modalFormOk"></quick-shipment-detail-modal>
229 229 <quality-inventory-detail-modal ref="qualityInventoryDetailModal" @ok="modalFormOk"></quality-inventory-detail-modal>
230 230 </a-card>
231 231 </template>
... ... @@ -238,15 +238,15 @@ import SimpleInventoryDetailModal from &#39;./modules/SimpleInventoryDetailModal&#39;
238 238 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
239 239 import {getCompanyList, getZoneList,} from "@api/api";
240 240 import {postAction} from '@/api/manage'
241   -import QuickShipmentDetailModel from "@views/system/shipment/modules/QuickShipmentDetailModal";
242   -import QualityInventoryDetailModal from "@views/system/inventory/QualityInventoryDetailModal";
  241 +import QuickShipmentDetailModal from "@views/system/shipment/modules/QuickShipmentDetailModal";
  242 +import QualityInventoryDetailModal from "@views/system/inventory/modules/QualityInventoryDetailModal";
243 243  
244 244 export default {
245 245 name: 'SimpleInventoryDetailList',
246 246 mixins: [JeecgListMixin, mixinDevice],
247 247 components: {
248 248 QualityInventoryDetailModal,
249   - QuickShipmentDetailModel,
  249 + QuickShipmentDetailModal,
250 250 SimpleInventoryDetailModal
251 251 },
252 252 data() {
... ... @@ -571,8 +571,8 @@ export default {
571 571 this.$message.warning('所选数据非同库区');
572 572 return;
573 573 }
574   - this.$refs.quickShipmentModel.edit(this.selectRecord);
575   - this.$refs.quickShipmentModel.title = '选择出库口';
  574 + this.$refs.quickShipmentDetailModal.edit(this.selectRecord);
  575 + this.$refs.quickShipmentDetailModal.title = '选择出库口';
576 576 }
577 577 },
578 578 qualityInventoryDetail() {
... ...
ant-design-vue-jeecg/src/views/system/inventory/QualityInventoryDetailModal.vue renamed to ant-design-vue-jeecg/src/views/system/inventory/modules/QualityInventoryDetailModal.vue
  View file @124debb
... ... @@ -14,7 +14,12 @@
14 14 <a-row>
15 15 <a-col :span="24">
16 16 <a-form-model-item label="出库口" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outPortCode">
17   - <a-select show-search placeholder="请选择出库口" option-filter-prop="children" v-model="model.outPortCode">
  17 + <a-select
  18 + show-search
  19 + placeholder="请选择出库口"
  20 + option-filter-prop="children"
  21 + v-model="model.outPortCode"
  22 + >
18 23 <a-select-option v-for="item in portList" :key="item.name" :value="item.code">
19 24 {{ item.name }}
20 25 </a-select-option>
... ... @@ -28,11 +33,11 @@
28 33 </template>
29 34  
30 35 <script>
31   -import {getZoneList, selectPickPort, shipmentInventoryDetail, qualityInventoryDetail} from '@/api/api'
  36 +import { getZoneList, selectPickPort, shipmentInventoryDetail, qualityInventoryDetail } from '@/api/api'
32 37  
33 38 export default {
34 39 name: 'QualityInventoryDetailModal',
35   - components: { },
  40 + components: {},
36 41 data() {
37 42 return {
38 43 title: '操作',
... ... @@ -60,17 +65,17 @@ export default {
60 65 },
61 66 created() {
62 67 //备份model原始值
63   - this.modelDefault = JSON.parse(JSON.stringify(this.model));
  68 + this.modelDefault = JSON.parse(JSON.stringify(this.model))
64 69 },
65 70 methods: {
66 71 add() {
67 72 this.edit(this.modelDefault)
68 73 },
69 74 edit(record) {
70   - this.visible = true;
71   - this.model.containerCode = record[0].containerCode;
72   - this.inventoryDetailList = record;
73   - this.getPortList();
  75 + this.visible = true
  76 + this.model.containerCode = record[0].containerCode
  77 + this.inventoryDetailList = record
  78 + this.getPortList()
74 79 },
75 80 close() {
76 81 this.$emit('close')
... ... @@ -81,26 +86,26 @@ export default {
81 86 this.querySource.containerCode = this.model.containerCode
82 87 selectPickPort(this.querySource).then(res => {
83 88 if (res.success) {
84   - this.portList = res.result;
85   - this.visible = true;
  89 + this.portList = res.result
  90 + this.visible = true
86 91 }
87 92 })
88 93 },
89 94 handleOk() {
90   - if (this.model.outPortCode === ''){
91   - this.$message.warning('请选择出库口');
  95 + if (this.model.outPortCode === '') {
  96 + this.$message.warning('请选择出库口')
92 97 }
93   - this.inventoryDetailList.forEach(x=>{
94   - x["toPortCode"]=this.model.outPortCode;
  98 + this.inventoryDetailList.forEach(x => {
  99 + x['toPortCode'] = this.model.outPortCode
95 100 })
96   - qualityInventoryDetail(this.inventoryDetailList).then((res) => {
  101 + qualityInventoryDetail(this.inventoryDetailList).then(res => {
97 102 if (res.success) {
98   - this.$message.success(res.message);
  103 + this.$message.success(res.message)
99 104 } else {
100   - this.$message.error(res.message);
  105 + this.$message.error(res.message)
101 106 }
102   - });
103   - this.$emit("ok", this.model.outPortCode);
  107 + })
  108 + this.$emit('ok', this.model.outPortCode)
104 109 this.close()
105 110 },
106 111 handleCancel() {
... ...
ant-design-vue-jeecg/src/views/system/receipt/QualityReportDetailList.vue
  View file @124debb
... ... @@ -210,7 +210,7 @@
210 210 </div>
211 211  
212 212 <simple-inventory-detail-modal ref="modalForm" @ok="modalFormOk"></simple-inventory-detail-modal>
213   - <quick-shipment-detail-model ref='quickShipmentModel' @ok="modalFormOk"></quick-shipment-detail-model>
  213 + <quick-shipment-detail-modal ref='quickShipmentDetailModal' @ok="modalFormOk"></quick-shipment-detail-modal>
214 214 <quality-inventory-detail-modal ref="qualityInventoryDetailModal" @ok="modalFormOk"></quality-inventory-detail-modal>
215 215 </a-card>
216 216 </template>
... ... @@ -222,15 +222,15 @@ import {JeecgListMixin} from &#39;@/mixins/JeecgListMixin&#39;
222 222 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
223 223 import {getCompanyList, getZoneList,} from "@api/api";
224 224 import {postAction} from '@/api/manage'
225   -import QuickShipmentDetailModel from "@views/system/shipment/modules/QuickShipmentDetailModal";
226   -import QualityInventoryDetailModal from "@views/system/inventory/QualityInventoryDetailModal";
  225 +import QuickShipmentDetailModal from "@views/system/shipment/modules/QuickShipmentDetailModal";
  226 +import QualityInventoryDetailModal from "@views/system/inventory/modules/QualityInventoryDetailModal";
227 227  
228 228 export default {
229 229 name: 'QualityReportDetailList',
230 230 mixins: [JeecgListMixin, mixinDevice],
231 231 components: {
232 232 QualityInventoryDetailModal,
233   - QuickShipmentDetailModel,
  233 + QuickShipmentDetailModal,
234 234 },
235 235 data() {
236 236 return {
... ...
ant-design-vue-jeecg/src/views/system/receipt/modules/QualityTestingModal.vue
  View file @124debb
... ... @@ -13,22 +13,22 @@
13 13 <a-row>
14 14 <a-col :span="24">
15 15 <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
16   - <a-input v-model="model.materialCode"placeholder="请输入物料编码" disabled="true"/></a-input>
  16 + <a-input v-model="model.materialCode" placeholder="请输入物料编码" disabled="true"/>
17 17 </a-form-model-item>
18 18 </a-col>
19 19 <a-col :span="24">
20 20 <a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
21   - <a-input v-model="model.materialName"placeholder="请输入物料名称" disabled="true"></a-input>
  21 + <a-input v-model="model.materialName" placeholder="请输入物料名称" disabled="true"/>
22 22 </a-form-model-item>
23 23 </a-col>
24 24 <a-col :span="24">
25 25 <a-form-model-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialSpec">
26   - <a-input v-model="model.materialSpec"placeholder="请输入物料规格" disabled="true"></a-input>
  26 + <a-input v-model="model.materialSpec" placeholder="请输入物料规格" disabled="true"/>
27 27 </a-form-model-item>
28 28 </a-col>
29 29 <a-col :span="24">
30 30 <a-form-model-item label="物料单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialUnit">
31   - <a-input v-model="model.materialUnit"placeholder="请输入物料单位" disabled="true"></a-input>
  31 + <a-input v-model="model.materialUnit" placeholder="请输入物料单位" disabled="true"/>
32 32 </a-form-model-item>
33 33 </a-col>
34 34 <a-col :span="24">
... ...
ant-design-vue-jeecg/src/views/system/shipment/modules/QuickShipmentDetailModal.vue
  View file @124debb
... ... @@ -14,7 +14,12 @@
14 14 <a-row>
15 15 <a-col :span="24">
16 16 <a-form-model-item label="出库口" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outPortCode">
17   - <a-select show-search placeholder="请选择出库口" option-filter-prop="children" v-model="model.outPortCode">
  17 + <a-select
  18 + show-search
  19 + placeholder="请选择出库口"
  20 + option-filter-prop="children"
  21 + v-model="model.outPortCode"
  22 + >
18 23 <a-select-option v-for="item in portList" :key="item.name" :value="item.code">
19 24 {{ item.name }}
20 25 </a-select-option>
... ... @@ -28,11 +33,11 @@
28 33 </template>
29 34  
30 35 <script>
31   -import {getZoneList, selectOutPort, shipmentInventoryDetail} from '@/api/api'
  36 +import { getZoneList, selectOutPort, shipmentInventoryDetail } from '@/api/api'
32 37  
33 38 export default {
34   - name: 'QuickShipmentDetailModel',
35   - components: { },
  39 + name: 'QuickShipmentDetailModal',
  40 + components: {},
36 41 data() {
37 42 return {
38 43 title: '操作',
... ... @@ -60,17 +65,17 @@ export default {
60 65 },
61 66 created() {
62 67 //备份model原始值
63   - this.modelDefault = JSON.parse(JSON.stringify(this.model));
  68 + this.modelDefault = JSON.parse(JSON.stringify(this.model))
64 69 },
65 70 methods: {
66 71 add() {
67 72 this.edit(this.modelDefault)
68 73 },
69 74 edit(record) {
70   - this.visible = true;
71   - this.model.containerCode = record[0].containerCode;
72   - this.inventoryDetailList = record;
73   - this.getPortList();
  75 + this.visible = true
  76 + this.model.containerCode = record[0].containerCode
  77 + this.inventoryDetailList = record
  78 + this.getPortList()
74 79 },
75 80 close() {
76 81 this.$emit('close')
... ... @@ -81,26 +86,26 @@ export default {
81 86 this.querySource.containerCode = this.model.containerCode
82 87 selectOutPort(this.querySource).then(res => {
83 88 if (res.success) {
84   - this.portList = res.result;
85   - this.visible = true;
  89 + this.portList = res.result
  90 + this.visible = true
86 91 }
87 92 })
88 93 },
89 94 handleOk() {
90   - if (this.model.outPortCode === ''){
91   - this.$message.warning('请选择出库口');
  95 + if (this.model.outPortCode === '') {
  96 + this.$message.warning('请选择出库口')
92 97 }
93   - this.inventoryDetailList.forEach(x=>{
94   - x["toPortCode"]=this.model.outPortCode;
  98 + this.inventoryDetailList.forEach(x => {
  99 + x['toPortCode'] = this.model.outPortCode
95 100 })
96   - shipmentInventoryDetail(this.inventoryDetailList).then((res) => {
  101 + shipmentInventoryDetail(this.inventoryDetailList).then(res => {
97 102 if (res.success) {
98   - this.$message.success(res.message);
  103 + this.$message.success(res.message)
99 104 } else {
100   - this.$message.error(res.message);
  105 + this.$message.error(res.message)
101 106 }
102   - });
103   - this.$emit("ok", this.model.outPortCode);
  107 + })
  108 + this.$emit('ok', this.model.outPortCode)
104 109 this.close()
105 110 },
106 111 handleCancel() {
... ...
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountDetailList.vue
  View file @124debb
... ... @@ -101,7 +101,7 @@
101 101 import CycleCountSelectModal from './modules/CycleCountSelectModal'
102 102 import CycleCountDetailChildSubTable from './subTables/CycleCountDetailChildSubTable'
103 103 import '@/assets/less/TableExpand.less'
104   - import {createCycleCoutTaskByDetailId, stockTakeTask} from "../../../api/api";
  104 + import {createCycleCoutTaskByDetailId, stockTakeTask} from "@/api/api";
105 105 import Utils from "../../../components/jeecgbiz/JButtonBizComponent/util.js"
106 106 import CycleCountDetailChiIdModal from "./modules/CycleCountDetailChiIdModal";
107 107  
... ...
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountHeaderList.vue
  View file @124debb
... ... @@ -119,7 +119,7 @@ import {JeecgListMixin} from &#39;@/mixins/JeecgListMixin&#39;
119 119 import {getCompanyList, getCountTypeList} from '@/api/api'
120 120 import CycleCountHeaderModal from './modules/CycleCountHeaderModal'
121 121 import CycleCountDetailList from "./CycleCountDetailList";
122   -import Utils from "@/components/jeecgbiz/JButtonBizComponent/util.js"
  122 +import Utils from "../../../components/jeecgbiz/JButtonBizComponent/util.js"
123 123 import CycleCountDetailModal from "./modules/CycleCountDetailModal";
124 124  
125 125 export default {
... ...
ant-design-vue-jeecg/src/views/system/stocktaking/modules/AdjustmentDocModal.vue
  View file @124debb
... ... @@ -24,8 +24,7 @@
24 24  
25 25 <script>
26 26  
27   -import {createManyEmptyIn} from '@/api/api'
28   -import {confirmGapQty} from "../../../../api/api";
  27 +import { createManyEmptyIn, confirmGapQty } from '@/api/api'
29 28 import Utils from '../../../../components/jeecgbiz/JButtonBizComponent/util.js';
30 29  
31 30 export default {
... ...
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailChiIdModal.vue
  View file @124debb
... ... @@ -46,9 +46,7 @@
46 46  
47 47 <script>
48 48  
49   -import {createManyEmptyIn} from '@/api/api'
50   -import {increaseInInventoryGain} from "../../../../api/api";
51   -import {searchMaterialByCode} from '@/api/api';
  49 +import { createManyEmptyIn, increaseInInventoryGain, searchMaterialByCode } from '@/api/api'
52 50 import Utils from '../../../../components/jeecgbiz/JButtonBizComponent/util.js';
53 51  
54 52 export default {
... ...
ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
  View file @124debb
... ... @@ -2,8 +2,8 @@
2 2 <a-card :bordered="false" :class="'cust-erp-sub-tab'">
3 3 <!-- 操作按钮区域 -->
4 4 <!-- <div class="table-operator" v-if="mainId"> -->
5   - <!-- <a-button @click="handleAdd" v-has="'taskDetail:add'" type="primary" icon="plus">新增</a-button> -->
6   - <!-- <a-button type="primary" icon="download" @click="handleExportXls('任务详情')">导出</a-button>
  5 + <!-- <a-button @click="handleAdd" v-has="'taskDetail:add'" type="primary" icon="plus">新增</a-button> -->
  6 + <!-- <a-button type="primary" icon="download" @click="handleExportXls('任务详情')">导出</a-button>
7 7 <a-upload
8 8 name="file"
9 9 :showUploadList="false"
... ... @@ -13,7 +13,7 @@
13 13 @change="handleImportExcel">
14 14 <a-button type="primary" icon="import">导入</a-button>
15 15 </a-upload> -->
16   - <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
  16 + <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
17 17 <a-menu slot="overlay" v-has="'taskDetail:deleteBatch'">
18 18 <a-menu-item key="1" @click="batchDel">
19 19 <a-icon type="delete"/> 删除
... ... @@ -38,15 +38,15 @@
38 38 size="middle"
39 39 bordered
40 40 rowKey="id"
41   - :scroll="{x:true}"
  41 + :scroll="{ x: true }"
42 42 :columns="columns"
43 43 :dataSource="dataSource"
44 44 :pagination="ipagination"
45 45 :loading="loading"
46   - @change="handleTableChange">
47   -
48   - <span slot='companyCode' slot-scope='companyCode'>
49   - <a-tag :key='companyCode' color='blue'>
  46 + @change="handleTableChange"
  47 + >
  48 + <span slot="companyCode" slot-scope="companyCode">
  49 + <a-tag :key="companyCode" color="blue">
50 50 {{ solutionCompany(companyCode) }}
51 51 </a-tag>
52 52 </span>
... ... @@ -62,52 +62,62 @@
62 62 </template>
63 63 <template slot="imgSlot" slot-scope="text">
64 64 <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
65   - <img v-else :src="getImgView(text)" height="25px" alt=""
66   - style="max-width:80px;font-size: 12px;font-style: italic;"/>
  65 + <img
  66 + v-else
  67 + :src="getImgView(text)"
  68 + height="25px"
  69 + alt=""
  70 + style="max-width:80px;font-size: 12px;font-style: italic;"
  71 + />
67 72 </template>
68 73 <template slot="fileSlot" slot-scope="text">
69 74 <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
70   - <a-button
71   - v-else
72   - :ghost="true"
73   - type="primary"
74   - icon="download"
75   - size="small"
76   - @click="downloadFile(text)">
  75 + <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
77 76 下载
78 77 </a-button>
79 78 </template>
80 79  
81 80 <span slot="action" slot-scope="text, record">
82   - <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id" :taskHeaderId="record.taskHeaderId"/>
83   - <a v-if="record.taskType==700 && record.status!=100" @click="createMany(record)">实盘登记<a-divider type="vertical" /></a>
84   - <a v-if="record.taskType==1400 && record.status!=100" @click="qualityRegister(record)">质检登记<a-divider type="vertical" /></a>
85   - <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical" /></a>
  81 + <adjustment-doc-modal
  82 + ref="adjustmentModal"
  83 + @ok="modalFormOk"
  84 + :id="record.id"
  85 + :taskHeaderId="record.taskHeaderId"
  86 + />
  87 +
  88 + <a v-if="record.taskType == 700 && record.status != 100" @click="createMany(record)"
  89 + >实盘登记<a-divider type="vertical"
  90 + /></a>
  91 + <a v-if="record.taskType == 1400 && record.status != 100" @click="qualityRegister(record)"
  92 + >质检登记<a-divider type="vertical"
  93 + /></a>
  94 + <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
86 95 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
87 96 <a v-has="'taskDetail:delete'">删除</a>
88 97 </a-popconfirm>
89 98 </span>
90   -
91 99 </a-table>
92 100 </div>
93   -
94   - <quality-register-detail-modal ref="qualityRegisterModal" @ok="modalFormOk"></quality-register-detail-modal>
  101 + <quality-register-detail-modal ref="qualityRegisterModal" @ok="modalFormOk"/>
95 102 <taskDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></taskDetail-modal>
96 103 </a-card>
97 104 </template>
98 105  
99 106 <script>
100   -
101   -import {JeecgListMixin} from '@/mixins/JeecgListMixin'
102   -import TaskDetailModal from './modules/TaskDetailModal'
103   -import AdjustmentDocModal from "../stocktaking/modules/AdjustmentDocModal";
  107 +import { JeecgListMixin } from '@/mixins/JeecgListMixin'
104 108 import { getCompanyList } from '@api/api'
105   -import QualityRegisterDetailModal from "@views/system/task/modules/QualityRegisterDetailModal";
  109 +import TaskDetailModal from './modules/TaskDetailModal'
  110 +import AdjustmentDocModal from '../stocktaking/modules/AdjustmentDocModal'
  111 +import QualityRegisterDetailModal from './modules/QualityRegisterDetailModal'
106 112  
107 113 export default {
108   - name: "TaskDetailList",
  114 + name: 'TaskDetailList',
109 115 mixins: [JeecgListMixin],
110   - components: {QualityRegisterDetailModal, TaskDetailModal,AdjustmentDocModal},
  116 + components: {
  117 + TaskDetailModal,
  118 + AdjustmentDocModal,
  119 + QualityRegisterDetailModal,
  120 + },
111 121 props: {
112 122 mainId: {
113 123 type: String,
... ... @@ -123,7 +133,7 @@ export default {
123 133 this.clearList()
124 134 } else {
125 135 this.queryParam['taskHeaderId'] = val
126   - this.loadData(1);
  136 + this.loadData(1)
127 137 }
128 138 }
129 139 }
... ... @@ -137,126 +147,126 @@ export default {
137 147 columns: [
138 148 {
139 149 title: '任务详情ID',
140   - align: "center",
  150 + align: 'center',
141 151 dataIndex: 'id'
142 152 },
143 153 {
144 154 title: '货主',
145   - align: "center",
  155 + align: 'center',
146 156 dataIndex: 'companyCode',
147 157 key: 'companyCode',
148   - scopedSlots: {customRender: 'companyCode'}
  158 + scopedSlots: { customRender: 'companyCode' }
149 159 },
150 160 {
151 161 title: '物料编码',
152   - align: "center",
  162 + align: 'center',
153 163 dataIndex: 'materialCode'
154 164 },
155 165 {
156 166 title: '物料名称',
157   - align: "center",
  167 + align: 'center',
158 168 dataIndex: 'materialName'
159 169 },
160 170 {
161 171 title: '物料规格',
162   - align: "center",
  172 + align: 'center',
163 173 dataIndex: 'materialSpec'
164 174 },
165 175 {
166 176 title: '物料单位',
167   - align: "center",
  177 + align: 'center',
168 178 dataIndex: 'materialUnit'
169 179 },
170 180 {
171 181 title: '数量',
172   - align: "center",
  182 + align: 'center',
173 183 dataIndex: 'qty'
174 184 },
175 185 {
176 186 title: '批次',
177   - align: "center",
  187 + align: 'center',
178 188 dataIndex: 'batch'
179 189 },
180 190 {
181 191 title: '库存状态',
182   - align: "center",
  192 + align: 'center',
183 193 dataIndex: 'inventoryStatus_dictText',
184   - scopedSlots: {customRender: 'inventoryStatus_dictText'}
  194 + scopedSlots: { customRender: 'inventoryStatus_dictText' }
185 195 },
186 196 {
187 197 title: '创建人',
188   - align: "center",
  198 + align: 'center',
189 199 dataIndex: 'createBy'
190 200 },
191 201 {
192 202 title: '创建日期',
193   - align: "center",
  203 + align: 'center',
194 204 dataIndex: 'createTime'
195 205 },
196 206 {
197 207 title: '更新人',
198   - align: "center",
  208 + align: 'center',
199 209 dataIndex: 'updateBy'
200 210 },
201 211 {
202 212 title: '更新日期',
203   - align: "center",
  213 + align: 'center',
204 214 dataIndex: 'updateTime'
205 215 },
206 216 {
207 217 title: '操作',
208 218 dataIndex: 'action',
209   - align: "center",
210   - fixed: "right",
  219 + align: 'center',
  220 + fixed: 'right',
211 221 width: 147,
212   - scopedSlots: {customRender: 'action'},
  222 + scopedSlots: { customRender: 'action' }
213 223 }
214 224 ],
215 225 url: {
216   - list: "/task/taskHeader/listTaskDetailByMainId",
217   - delete: "/task/taskHeader/deleteTaskDetail",
218   - deleteBatch: "/task/taskHeader/deleteBatchTaskDetail",
219   - exportXlsUrl: "/task/taskHeader/exportTaskDetail",
220   - importUrl: "/task/taskHeader/importTaskDetail",
  226 + list: '/task/taskHeader/listTaskDetailByMainId',
  227 + delete: '/task/taskHeader/deleteTaskDetail',
  228 + deleteBatch: '/task/taskHeader/deleteBatchTaskDetail',
  229 + exportXlsUrl: '/task/taskHeader/exportTaskDetail',
  230 + importUrl: '/task/taskHeader/importTaskDetail'
221 231 },
222 232 dictOptions: {
223 233 taskType: [],
224 234 isEmptyOut: [],
225 235 isDoubleIn: [],
226   - status: [],
  236 + status: []
227 237 }
228 238 }
229 239 },
230 240 created() {
231   - this.loadFrom();
  241 + this.loadFrom()
232 242 },
233 243 computed: {
234 244 importExcelUrl() {
235   - return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
  245 + return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`
236 246 }
237 247 },
238 248 methods: {
239 249 getStatusColor(status) {
240 250 const colors = {
241   - '良品': 'green',
242   - '报废品': 'purple',
  251 + 良品: 'green',
  252 + 报废品: 'purple',
243 253 '待确认 ': 'grey',
244   - '次品': 'red',
  254 + 次品: 'red',
245 255 default: 'blue'
246   - };
247   - return colors[status] || colors.default;
  256 + }
  257 + return colors[status] || colors.default
248 258 },
249 259 loadFrom() {
250   - getCompanyList().then((res) => {
  260 + getCompanyList().then(res => {
251 261 if (res.success) {
252 262 this.companyList = res.result
253 263 }
254   - });
  264 + })
255 265 },
256 266 solutionCompany(value) {
257 267 var actions = []
258   - Object.keys(this.companyList).some((key) => {
259   - if (this.companyList[key].code == ('' + value)) {
  268 + Object.keys(this.companyList).some(key => {
  269 + if (this.companyList[key].code == '' + value) {
260 270 actions.push(this.companyList[key].name)
261 271 return true
262 272 }
... ... @@ -269,16 +279,16 @@ export default {
269 279 this.ipagination.current = 1
270 280 },
271 281 createMany(record) {
272   - this.$refs.adjustmentModal.edit(record);
273   - this.$refs.adjustmentModal.title = "实盘登记";
  282 + this.$refs.adjustmentModal.edit(record)
  283 + this.$refs.adjustmentModal.title = '实盘登记'
274 284 },
275 285 qualityRegister(record) {
276   - this.$refs.qualityRegisterModal.edit(record);
277   - this.$refs.qualityRegisterModal.title = "质检登记";
278   - },
  286 + this.$refs.qualityRegisterModal.edit(record)
  287 + this.$refs.qualityRegisterModal.title = '质检登记'
  288 + }
279 289 }
280 290 }
281 291 </script>
282 292 <style scoped>
283   -@import '~@assets/less/common.less'
  293 +@import '~@assets/less/common.less';
284 294 </style>
... ...
ant-design-vue-jeecg/src/views/system/task/modules/QualityRegisterDetailModal.vue
  View file @124debb
... ... @@ -27,8 +27,8 @@
27 27 </a-form-model-item>
28 28 </a-col>
29 29 <a-col :xs="24">
30   - <a-form-model-item label="合格数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qualityfiedQty">
31   - <a-input v-model="model.qualityfiedQty" placeholder="请输入合格数量"></a-input>
  30 + <a-form-model-item label="不合格数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unqualityfiedQty">
  31 + <a-input v-model="model.unqualityfiedQty" placeholder="请输入不合格数量"></a-input>
32 32 </a-form-model-item>
33 33 </a-col>
34 34 <a-col :xs="24">
... ... @@ -44,78 +44,73 @@
44 44  
45 45 <script>
46 46  
47   -import {createManyEmptyIn, qualityRegister} from '@/api/api'
48   -import {confirmGapQty} from "../../../../api/api";
49   -import Utils from '../../../../components/jeecgbiz/JButtonBizComponent/util.js';
  47 +import {httpAction} from '@/api/manage'
  48 +import { createManyEmptyIn, qualityRegister, confirmGapQty } from '@/api/api'
50 49  
51 50 export default {
52   - name: "QualityRegisterDetailModal",
  51 + name: 'QualityRegisterDetailModal',
53 52 components: {},
54 53 props: {
55   - taskHeaderId:"",
  54 + taskHeaderId: ''
56 55 },
57 56 data() {
58 57 return {
59   - title: "操作",
  58 + title: '操作',
60 59 width: 500,
61 60 visible: false,
62 61 model: {},
63 62 labelCol: {
64   - xs: {span: 24},
65   - sm: {span: 5},
  63 + xs: { span: 24 },
  64 + sm: { span: 5 }
66 65 },
67 66 wrapperCol: {
68   - xs: {span: 24},
69   - sm: {span: 16},
  67 + xs: { span: 24 },
  68 + sm: { span: 16 }
70 69 },
71 70  
72 71 confirmLoading: false,
73 72 validatorRules: {
74   - countedQty: [
75   - {required: true, message: '请输入实盘数量!'},
76   - ],
  73 + countedQty: [{ required: true, message: '请输入实盘数量!' }]
77 74 },
78 75 url: {
79   - add: "/cycleCountDetail/cycleCountDetail/confirmGapQty",
  76 + add: '/cycleCountDetail/cycleCountDetail/confirmGapQty'
80 77 }
81   -
82 78 }
83 79 },
84 80  
85   -
86 81 created() {
87 82 //备份model原始值
88   - this.modelDefault = JSON.parse(JSON.stringify(this.model));
  83 + this.modelDefault = JSON.parse(JSON.stringify(this.model))
89 84 },
90 85  
91 86 methods: {
92 87 add() {
93   - this.edit(this.modelDefault);
  88 + this.edit(this.modelDefault)
94 89 },
95 90 edit(record) {
96   - this.visible = true;
97   - this.model = Object.assign({}, record);
  91 + this.visible = true
  92 + this.model = Object.assign({}, record)
98 93 },
99 94 close() {
100   - this.$emit('close');
101   - this.visible = false;
102   - this.$refs.form.clearValidate();
  95 + this.$emit('close')
  96 + this.visible = false
  97 + this.$refs.form.clearValidate()
103 98 },
104 99 handleOk() {
105   - const that = this;
  100 + const that = this
106 101 // 触发表单验证
107 102 this.$refs.form.validate(valid => {
108 103 if (valid) {
109   - that.confirmLoading = true;
110   - qualityRegister(this.model).then((res) => {
  104 + that.confirmLoading = true
  105 + qualityRegister(this.model).then(res => {
111 106 if (res.success) {
112   - that.$message.success(res.message);
  107 + that.$message.success(res.message)
113 108 } else {
114   - that.$message.warning(res.message);
  109 + that.$message.warning(res.message)
115 110 }
116 111 }).finally(() => {
117   - that.confirmLoading = false;
118   - that.close();
  112 + that.confirmLoading = false
  113 + that.close()
119 114 })
120 115 } else {
121 116 return false
... ... @@ -124,9 +119,7 @@ export default {
124 119 },
125 120 handleCancel() {
126 121 this.close()
127   - },
128   -
129   -
  122 + }
130 123 }
131 124 }
132 125 </script>
133 126 \ No newline at end of file
... ...