雷海东 / factory-web · 提交

转到一个项目

作者 张晓杰
提交 9c7bb386dd868864c095b5de64c65856a426e667 1 个父辈 51460e77

生产订单查看已派发工时，生产订单数量加单位（套）

内嵌 并排对比
正在显示 8 个修改的文件 包含 221 行增加 和 88 行删除
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <a-row> 5 <a-row>
6 <a-col :span="24"> 6 <a-col :span="24">
7 <a-form-model-item label="选择" :labelCol="labelCol" :wrapperCol="wrapperCol" > 7 <a-form-model-item label="选择" :labelCol="labelCol" :wrapperCol="wrapperCol" >
8 - <a-radio-group @change="onChange" v-model="selectedValue"> 8 + <a-radio-group @change="onChange" v-model="model.chooseStatus">
9 <a-radio :value="'0'" > 9 <a-radio :value="'0'" >
10 从物料表选择 10 从物料表选择
11 </a-radio> 11 </a-radio>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num"> 37 <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
38 <a-input-number 38 <a-input-number
39 v-model="model.num" 39 v-model="model.num"
40 - placeholder="请输入数量" 40 + placeholder="请输入数量（套）"
41 style="width: 100%" 41 style="width: 100%"
42 /> 42 />
43 </a-form-model-item> 43 </a-form-model-item>
@@ -207,7 +207,6 @@ export default { @@ -207,7 +207,6 @@ export default {
207 }, 207 },
208 created() { 208 created() {
209 this.loadTree() 209 this.loadTree()
210 - this.model.chooseStatus = this.selectedValue  
211 //备份model原始值 210 //备份model原始值
212 // this.modelDefault = JSON.parse(JSON.stringify(this.model)) 211 // this.modelDefault = JSON.parse(JSON.stringify(this.model))
213 }, 212 },
@@ -226,9 +225,12 @@ export default { @@ -226,9 +225,12 @@ export default {
226 }, 225 },
227 edit(record) { 226 edit(record) {
228 this.model = Object.assign({}, record) 227 this.model = Object.assign({}, record)
  228 + console.log('this.model',this.model)
229 this.modelDefault = this.model 229 this.modelDefault = this.model
230 - // console.log('this.model:::::',this.model)  
231 - this.selectedValue = this.model.chooseStatus 230 + if(!this.model.chooseStatus){
  231 + this.model.chooseStatus = '0'
  232 + }
  233 +
232 this.visible = true 234 this.visible = true
233 if (this.userInfo().username === 'admin') { 235 if (this.userInfo().username === 'admin') {
234 this.isBianhaoDisabled = true 236 this.isBianhaoDisabled = true
@@ -248,21 +250,21 @@ export default { @@ -248,21 +250,21 @@ export default {
248 onChange(e) { 250 onChange(e) {
249 console.log('this.modelDefault',this.modelDefault) 251 console.log('this.modelDefault',this.modelDefault)
250 if(!this.modelDefault.id){ 252 if(!this.modelDefault.id){
251 - if(e.target.value == 1){ 253 + if(e.target.value == '1'){
252 this.model = {} 254 this.model = {}
253 - this.model.chooseStatus = 1  
254 - }else if(e.target.value == 0){ 255 + this.model.chooseStatus = '1'
  256 + }else if(e.target.value == '0'){
255 this.model = {} 257 this.model = {}
256 - this.model.chooseStatus = 0 258 + this.model.chooseStatus = '0'
257 } 259 }
258 }else if(this.modelDefault.id){ 260 }else if(this.modelDefault.id){
259 - if(e.target.value == 1){ 261 + if(e.target.value == '1'){
260 this.model = {} 262 this.model = {}
261 - this.model.chooseStatus = 1  
262 - }else if(e.target.value == 0){ 263 + this.model.chooseStatus = '1'
  264 + }else if(e.target.value == '0'){
263 this.model = this.modelDefault 265 this.model = this.modelDefault
264 console.log(this.model) 266 console.log(this.model)
265 - // this.model.chooseStatus = 0 267 + this.model.chooseStatus = '0'
266 } 268 }
267 } 269 }
268 270
@@ -74,27 +74,9 @@ @@ -74,27 +74,9 @@
74 :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}" 74 :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
75 :customRow="clickThenSelect" 75 :customRow="clickThenSelect"
76 @change="handleMyTableChange"> 76 @change="handleMyTableChange">
77 -  
78 - <template slot="htmlSlot" slot-scope="text">  
79 - <div v-html="text"></div>  
80 - </template>  
81 - <template slot="imgSlot" slot-scope="text,record">  
82 - <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>  
83 - <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>  
84 - </template>  
85 - <template slot="fileSlot" slot-scope="text">  
86 - <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>  
87 - <a-button  
88 - v-else  
89 - :ghost="true"  
90 - type="primary"  
91 - icon="download"  
92 - size="small"  
93 - @click="downloadFile(text)">  
94 - 下载  
95 - </a-button> 77 + <template slot="dispatchedWorkingHoursSlot" slot-scope="text,record">
  78 + <a v-if="text" @click="handleViewProductionPlan(record)" >{{ text }}</a>
96 </template> 79 </template>
97 -  
98 <span slot="action" slot-scope="text, record"> 80 <span slot="action" slot-scope="text, record">
99 <div v-if="record.assignDesignStatus === '0'"> 81 <div v-if="record.assignDesignStatus === '0'">
100 <a @click="handleAssignDesign(record)" >派任务</a> 82 <a @click="handleAssignDesign(record)" >派任务</a>
@@ -117,6 +99,7 @@ @@ -117,6 +99,7 @@
117 <tblOrderForm-modal ref="modalForm" @ok="modalFormOk"></tblOrderForm-modal> 99 <tblOrderForm-modal ref="modalForm" @ok="modalFormOk"></tblOrderForm-modal>
118 <AssignDesignModal ref="AssignDesignModal" @ok="modalFormOk"></AssignDesignModal> 100 <AssignDesignModal ref="AssignDesignModal" @ok="modalFormOk"></AssignDesignModal>
119 <ViewOrdersModal ref="ViewOrdersModal" @ok="modalFormOk"></ViewOrdersModal> 101 <ViewOrdersModal ref="ViewOrdersModal" @ok="modalFormOk"></ViewOrdersModal>
  102 + <ViewProductionPlanModal ref="ViewProductionPlanModal" @ok="modalFormOk"></ViewProductionPlanModal>
120 </a-card> 103 </a-card>
121 </template> 104 </template>
122 105
@@ -127,6 +110,7 @@ @@ -127,6 +110,7 @@
127 import { getAction } from '@/api/manage' 110 import { getAction } from '@/api/manage'
128 import AssignDesignModal from './modules/AssignDesignModal' 111 import AssignDesignModal from './modules/AssignDesignModal'
129 import ViewOrdersModal from './modules/ViewOrdersModal' 112 import ViewOrdersModal from './modules/ViewOrdersModal'
  113 + import ViewProductionPlanModal from './modules/ViewProductionPlanModal'
130 import {listProductType} from '@/api/ProductTpye' 114 import {listProductType} from '@/api/ProductTpye'
131 import '@/assets/less/TableExpand.less' 115 import '@/assets/less/TableExpand.less'
132 116
@@ -135,7 +119,7 @@ @@ -135,7 +119,7 @@
135 mixins:[JeecgListMixin], 119 mixins:[JeecgListMixin],
136 components: { 120 components: {
137 TblOrderFormModal, 121 TblOrderFormModal,
138 - AssignDesignModal,ViewOrdersModal 122 + AssignDesignModal,ViewOrdersModal,ViewProductionPlanModal
139 }, 123 },
140 data () { 124 data () {
141 return { 125 return {
@@ -177,23 +161,23 @@ @@ -177,23 +161,23 @@
177 title:'产品类型', 161 title:'产品类型',
178 align:"center", 162 align:"center",
179 dataIndex: 'productType', 163 dataIndex: 'productType',
180 - customRender: function (text) {  
181 - if (text === 'XC') {  
182 - return '线槽'  
183 - } else if (text === 'JD') {  
184 - return '接地'  
185 - } else if (text === 'QZ') {  
186 - return '卡子'  
187 - } else if (text === 'GX') {  
188 - return '柜、箱、盒'  
189 - } else if (text === 'SJ') {  
190 - return '司机室'  
191 - } else if (text === 'FS') {  
192 - return '附属钢'  
193 - } else {  
194 - return text  
195 - }  
196 - }, 164 + // customRender: function (text) {
  165 + // if (text === 'XC') {
  166 + // return '线槽'
  167 + // } else if (text === 'JD') {
  168 + // return '接地'
  169 + // } else if (text === 'QZ') {
  170 + // return '卡子'
  171 + // } else if (text === 'GX') {
  172 + // return '柜、箱、盒'
  173 + // } else if (text === 'SJ') {
  174 + // return '司机室'
  175 + // } else if (text === 'FS') {
  176 + // return '附属钢'
  177 + // } else {
  178 + // return text
  179 + // }
  180 + // },
197 }, 181 },
198 { 182 {
199 title:'任务下达时间', 183 title:'任务下达时间',
@@ -217,7 +201,7 @@ @@ -217,7 +201,7 @@
217 } 201 }
218 }, 202 },
219 { 203 {
220 - title:'数量', 204 + title:'数量（套）',
221 align:"center", 205 align:"center",
222 dataIndex: 'quantity' 206 dataIndex: 'quantity'
223 }, 207 },
@@ -229,7 +213,8 @@ @@ -229,7 +213,8 @@
229 { 213 {
230 title:'已派发工时', 214 title:'已派发工时',
231 align:"center", 215 align:"center",
232 - dataIndex: 'dispatchedWorkingHours' 216 + dataIndex: 'dispatchedWorkingHours',
  217 + scopedSlots: { customRender: 'dispatchedWorkingHoursSlot' },
233 }, 218 },
234 // { 219 // {
235 // title:'出货日期', 220 // title:'出货日期',
@@ -342,7 +327,11 @@ @@ -342,7 +327,11 @@
342 this.$refs.ViewOrdersModal.edit(record); 327 this.$refs.ViewOrdersModal.edit(record);
343 this.$refs.ViewOrdersModal.disableSubmit = false; 328 this.$refs.ViewOrdersModal.disableSubmit = false;
344 }, 329 },
345 - 330 + handleViewProductionPlan(record){
  331 + console.log('handleViewProductionPlan',record)
  332 + this.$refs.ViewProductionPlanModal.edit(record);
  333 + this.$refs.ViewProductionPlanModal.disableSubmit = false;
  334 + },
346 initDictConfig(){ 335 initDictConfig(){
347 }, 336 },
348 clickThenSelect(record) { 337 clickThenSelect(record) {
@@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
17 </a-form-model-item> 17 </a-form-model-item>
18 </a-col> 18 </a-col>
19 <a-col :span="24"> 19 <a-col :span="24">
20 - <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity">  
21 - <a-input v-model="model.quantity" placeholder="请输入数量" disabled></a-input> 20 + <a-form-model-item label="数量（套）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity">
  21 + <a-input v-model="model.quantity" placeholder="请输入数量（套）" disabled></a-input>
22 </a-form-model-item> 22 </a-form-model-item>
23 </a-col> 23 </a-col>
24 <a-col :span="24"> 24 <a-col :span="24">
@@ -27,8 +27,8 @@ @@ -27,8 +27,8 @@
27 </a-form-model-item> 27 </a-form-model-item>
28 </a-col> 28 </a-col>
29 <a-col :span="24"> 29 <a-col :span="24">
30 - <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity">  
31 - <a-input v-model="model.quantity" placeholder="请输入数量"></a-input> 30 + <a-form-model-item label="数量（套）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity">
  31 + <a-input v-model="model.quantity" placeholder="请输入数量（套）"></a-input>
32 </a-form-model-item> 32 </a-form-model-item>
33 </a-col> 33 </a-col>
34 <a-col :span="24"> 34 <a-col :span="24">
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <a-spin :spinning="confirmLoading"> 4 <a-spin :spinning="confirmLoading">
5 <div style="display: flex"> 5 <div style="display: flex">
6 <div style="display:inline-block;width:50%;margin: auto;"> 6 <div style="display:inline-block;width:50%;margin: auto;">
7 - <table> 7 + <table style="margin: auto;">
8 <tr> 8 <tr>
9 <th scop="col" class="table_lable">订单号：</th> 9 <th scop="col" class="table_lable">订单号：</th>
10 <th scop="col">{{model.orderId}}</th> 10 <th scop="col">{{model.orderId}}</th>
@@ -24,12 +24,13 @@ @@ -24,12 +24,13 @@
24 <tr> 24 <tr>
25 <th scop="col" class="table_lable">产品类型：</th> 25 <th scop="col" class="table_lable">产品类型：</th>
26 <th scop="col"> 26 <th scop="col">
27 - <span v-if="model.productType =='XC'">线槽</span> 27 + {{model.productType}}
  28 + <!-- <span v-if="model.productType =='XC'">线槽</span>
28 <span v-if="model.productType =='JD'">接地</span> 29 <span v-if="model.productType =='JD'">接地</span>
29 <span v-if="model.productType =='QZ'">卡子</span> 30 <span v-if="model.productType =='QZ'">卡子</span>
30 <span v-if="model.productType =='GX'">柜、箱、盒</span> 31 <span v-if="model.productType =='GX'">柜、箱、盒</span>
31 <span v-if="model.productType =='SJ'">司机室</span> 32 <span v-if="model.productType =='SJ'">司机室</span>
32 - <span v-if="model.productType =='FS'">附属钢</span> 33 + <span v-if="model.productType =='FS'">附属钢</span> -->
33 </th> 34 </th>
34 </tr> 35 </tr>
35 <tr> 36 <tr>
@@ -89,7 +90,7 @@ import { duplicateCheck } from '@/api/api' @@ -89,7 +90,7 @@ import { duplicateCheck } from '@/api/api'
89 import {listProductType} from '@/api/ProductTpye' 90 import {listProductType} from '@/api/ProductTpye'
90 import { JeecgListMixin } from '@/mixins/JeecgListMixin' 91 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
91 import moment from 'moment' 92 import moment from 'moment'
92 -let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot"; 93 +// let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
93 export default { 94 export default {
94 name: "ViewOrdersModal", 95 name: "ViewOrdersModal",
95 mixins: [JeecgListMixin], 96 mixins: [JeecgListMixin],
@@ -98,7 +99,7 @@ export default { @@ -98,7 +99,7 @@ export default {
98 data() { 99 data() {
99 return { 100 return {
100 title: "生产订单详情", 101 title: "生产订单详情",
101 - baseURL:apiBaseUrl, 102 + // baseURL:apiBaseUrl,
102 httpUrl:window._CONFIG['staticDomainURL']+'/', 103 httpUrl:window._CONFIG['staticDomainURL']+'/',
103 options:[], 104 options:[],
104 width: 1000, 105 width: 1000,
@@ -128,7 +129,7 @@ export default { @@ -128,7 +129,7 @@ export default {
128 // this.model.status = '未下单' 129 // this.model.status = '未下单'
129 //备份model原始值 130 //备份model原始值
130 this.modelDefault = JSON.parse(JSON.stringify(this.model)); 131 this.modelDefault = JSON.parse(JSON.stringify(this.model));
131 - console.log(apiBaseUrl) 132 + // console.log(apiBaseUrl)
132 }, 133 },
133 methods: { 134 methods: {
134 add() { 135 add() {
  1 +<template>
  2 + <j-modal
  3 + :title="title"
  4 + :width="width"
  5 + :visible="visible"
  6 + switchFullscreen
  7 + @ok="handleOk"
  8 + :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
  9 + @cancel="handleCancel"
  10 + cancelText="关闭">
  11 + <a-table :columns="columns" :data-source="dataSource" style="width: auto" :pagination="false"></a-table>
  12 + </j-modal>
  13 +</template>
  14 +
  15 +<script>
  16 +
  17 + import ViewProductionPlanForm from './ViewProductionPlanForm'
  18 + import {querygx} from '@/api/manage'
  19 + export default {
  20 + name: 'ViewProductionPlanModal',
  21 + components: {
  22 + ViewProductionPlanForm
  23 + },
  24 + data () {
  25 + return {
  26 + title:'生产订单-已派发工时',
  27 + width:1200,
  28 + visible: false,
  29 + disableSubmit: false,
  30 + dataSource:[],
  31 + columns: [
  32 + {
  33 + title: '工序',
  34 + align: 'center',
  35 + dataIndex: 'workingProcedure',
  36 + },
  37 + {
  38 + title: '承接人',
  39 + align: 'center',
  40 + dataIndex: 'undertaker',
  41 + },
  42 + {
  43 + title: '工时',
  44 + align: 'center',
  45 + dataIndex: 'workHours',
  46 + },
  47 +
  48 + {
  49 + title: '派发时间',
  50 + align: 'center',
  51 + dataIndex: 'dispatchTime',
  52 + customRender: function (text) {
  53 + return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
  54 + },
  55 + },
  56 + {
  57 + title: '派发人',
  58 + align: 'center',
  59 + dataIndex: 'dispatchRen',
  60 + },
  61 + {
  62 + title: '验收时间',
  63 + align: 'center',
  64 + dataIndex: 'yanTime',
  65 + customRender: function (text) {
  66 + return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
  67 + },
  68 + },
  69 + {
  70 + title: '验收人',
  71 + align: 'center',
  72 + dataIndex: 'yanRen',
  73 + },
  74 + {
  75 + title: '验收结果',
  76 + align: 'center',
  77 + dataIndex: 'yanResult',
  78 + },
  79 + {
  80 + title: '备注',
  81 + align: 'center',
  82 + dataIndex: 'notes',
  83 + },
  84 + ],
  85 + url: {
  86 + querygx: '/production/tblProductionPlan/querygx',
  87 + },
  88 + }
  89 + },
  90 + methods: {
  91 + add () {
  92 + this.visible=true
  93 + this.$nextTick(()=>{
  94 + this.$refs.realForm.add();
  95 + })
  96 + },
  97 + queryBynumber(orderNumber){
  98 + this.visible=true
  99 + this.$nextTick(()=>{
  100 + this.$refs.realForm.queryBynumber(orderNumber);
  101 + })
  102 + },
  103 + querygx(){
  104 + // var that = this;
  105 + const params = {
  106 + orderNumber:this.model.orderId,
  107 + productType:this.model.productTypeId
  108 + }
  109 + querygx(this.url.querygx,params).then((res)=>{
  110 + if(res.success){
  111 + console.log('res',res)
  112 + this.dataSource =res.result
  113 + // that.treeData = [];
  114 + // that.options = res.result
  115 + }
  116 + });
  117 + },
  118 +
  119 + edit (record) {
  120 + this.model = Object.assign({}, record);
  121 + console.log('this.model',this.model)
  122 + this.visible = true;
  123 + this.querygx()
  124 + },
  125 + close () {
  126 + this.$emit('close');
  127 + this.visible = false;
  128 + },
  129 + handleOk () {
  130 + this.$refs.realForm.submitForm();
  131 + },
  132 + submitCallback(){
  133 + this.$emit('ok');
  134 + this.visible = false;
  135 + },
  136 + handleCancel () {
  137 + this.close()
  138 + }
  139 + }
  140 + }
  141 +</script>
@@ -157,23 +157,23 @@ @@ -157,23 +157,23 @@
157 title:'产品类型', 157 title:'产品类型',
158 align:"center", 158 align:"center",
159 dataIndex: 'productType', 159 dataIndex: 'productType',
160 - customRender: function (text) {  
161 - if (text === 'XC') {  
162 - return '线槽'  
163 - } else if (text === 'JD') {  
164 - return '接地'  
165 - } else if (text === 'QZ') {  
166 - return '卡子'  
167 - } else if (text === 'GX') {  
168 - return '柜、箱、盒'  
169 - } else if (text === 'SJ') {  
170 - return '司机室'  
171 - } else if (text === 'FS') {  
172 - return '附属钢'  
173 - } else {  
174 - return text  
175 - }  
176 - }, 160 + // customRender: function (text) {
  161 + // if (text === 'XC') {
  162 + // return '线槽'
  163 + // } else if (text === 'JD') {
  164 + // return '接地'
  165 + // } else if (text === 'QZ') {
  166 + // return '卡子'
  167 + // } else if (text === 'GX') {
  168 + // return '柜、箱、盒'
  169 + // } else if (text === 'SJ') {
  170 + // return '司机室'
  171 + // } else if (text === 'FS') {
  172 + // return '附属钢'
  173 + // } else {
  174 + // return text
  175 + // }
  176 + // },
177 }, 177 },
178 { 178 {
179 title:'任务下达时间', 179 title:'任务下达时间',
@@ -197,7 +197,7 @@ @@ -197,7 +197,7 @@
197 } 197 }
198 }, 198 },
199 { 199 {
200 - title:'数量', 200 + title:'数量（套）',
201 align:"center", 201 align:"center",
202 dataIndex: 'quantity' 202 dataIndex: 'quantity'
203 }, 203 },
@@ -5,22 +5,22 @@ @@ -5,22 +5,22 @@
5 <a-form-model ref="form" :model="model"> 5 <a-form-model ref="form" :model="model">
6 <a-row> 6 <a-row>
7 <a-col :span="24"> 7 <a-col :span="24">
8 - <a-form-model-item label="工作令" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrder"> 8 + <a-form-model-item label="工作令" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrder" style="margin-bottom: -50px">
9 {{model.workOrder}} 9 {{model.workOrder}}
10 </a-form-model-item> 10 </a-form-model-item>
11 </a-col> 11 </a-col>
12 <a-col :span="24"> 12 <a-col :span="24">
13 - <a-form-model-item label="产品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productName"> 13 + <a-form-model-item label="产品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productName" style="margin-bottom: -50px">
14 {{model.productName}} 14 {{model.productName}}
15 </a-form-model-item> 15 </a-form-model-item>
16 </a-col> 16 </a-col>
17 - <!-- <a-col :span="24">  
18 - <a-form-model-item label="产品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productType"> 17 + <a-col :span="24">
  18 + <a-form-model-item label="产品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productType" style="margin-bottom: -50px">
19 {{model.productType}} 19 {{model.productType}}
20 </a-form-model-item> 20 </a-form-model-item>
21 - </a-col> --> 21 + </a-col>
22 <a-col :span="24"> 22 <a-col :span="24">
23 - <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity"> 23 + <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity" style="margin-bottom: -50px">
24 {{model.quantity}} 24 {{model.quantity}}
25 </a-form-model-item> 25 </a-form-model-item>
26 </a-col> 26 </a-col>