| src/views/produce/stepReport.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/produceOrderList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/workOrderClose.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/workOrderList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/workOrderSend.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/produce/stepReport.vue
@@ -275,6 +275,26 @@ </el-table-column> <el-table-column prop="weight" label="重量" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template> </el-table-column> <el-table-column prop="totalnumber" label="总料" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template> </el-table-column> <el-table-column prop="plan_qty" label="任务数量" width="110" @@ -374,7 +394,7 @@ :visible.sync="dialogVisible" width="1160px" :close-on-click-modal="false" :top="activeName==='生产列表'||activeName==='外协收料'? '6vh':'15vh'" :top="activeName==='生产列表'||activeName==='外协收料'? '6vh':'8vh'" @closed="handleClose" @close="handleClose" > @@ -410,6 +430,12 @@ </el-form-item> <el-form-item label="颜色" class="dialogFormItem"> <div class="dialogFormItemDiv">{{ dialogForm.colour? dialogForm.colour:'/' }}</div> </el-form-item> <el-form-item label="重量" class="dialogFormItem"> <div class="dialogFormItemDiv">{{ dialogForm.weight? dialogForm.weight:'/' }}</div> </el-form-item> <el-form-item label="总料" class="dialogFormItem"> <div class="dialogFormItemDiv">{{ dialogForm.totalnumber? dialogForm.totalnumber:'/' }}</div> </el-form-item> <el-form-item label="任务数量" class="dialogFormItem"> @@ -1197,6 +1223,8 @@ this.dialogForm.customercode = row.customercode this.dialogForm.customername = row.customername this.dialogForm.colour = row.colour this.dialogForm.weight = row.weight this.dialogForm.totalnumber = row.totalnumber if (this.activeName === '外协收料') { this.dialogForm.list = [] src/views/workOrder/produceOrderList.vue
@@ -296,6 +296,26 @@ > <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template> </el-table-column> <el-table-column prop="weight" label="重量" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template> </el-table-column> <el-table-column prop="totalnumber" label="总料" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template> </el-table-column> <el-table-column prop="clerkuser" label="销售业务员" @@ -514,6 +534,19 @@ v-model="dialogForm.colour" style="width: 200px" disabled /> </el-form-item> <el-form-item label="重量"> <el-input v-model="dialogForm.weight" style="width: 200px" /> </el-form-item> <el-form-item label="总料"> <el-input v-model="dialogForm.totalnumber" style="width: 200px" /> </el-form-item> @@ -801,7 +834,10 @@ 'injectnumber': '', // 注塑机号 'customercode': '', // 客户编号 'customername': '', // 客户名称 'colour': ''// 颜色 'colour': '', // 颜色 weight: '', // 重量 totalnumber: ''// 总料 }, operation: '', @@ -1092,6 +1128,8 @@ 'customercode': i.customercode, 'customername': i.customername, 'colour': i.colour, 'weight': i.weight, 'totalnumber': i.totalnumber, // 'saleOrderDeliveryDate': i.saleOrderDeliveryDate 'saleOrderDeliveryDate': handleDatetime(new Date()) + ' 00:00:00' }) @@ -1158,6 +1196,9 @@ this.dialogForm.customercode = row.customercode this.dialogForm.customername = row.customername this.dialogForm.colour = row.colour this.dialogForm.weight = row.weight this.dialogForm.totalnumber = row.totalnumber }) }, // 对话框关闭事件 @@ -1187,6 +1228,9 @@ customercode: '', customername: '', colour: '', weight: '', totalnumber: '', saleOrderDeliveryDate: '' // 预计交付日期 } @@ -1230,6 +1274,8 @@ 'customercode': this.dialogForm.customercode, // 客户编号 'customername': this.dialogForm.customername, // 客户名称 'colour': this.dialogForm.colour, // 颜色 'weight': this.dialogForm.weight, // 颜色 'totalnumber': this.dialogForm.totalnumber, // 颜色 'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00' }
@@ -285,6 +285,27 @@ > <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template> </el-table-column> <el-table-column prop="weight" label="重量" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template> </el-table-column> <el-table-column prop="totalnumber" label="总料" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template> </el-table-column> <el-table-column prop="wkshp_name" label="生产车间" src/views/workOrder/workOrderList.vue
@@ -223,6 +223,27 @@ > <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template> </el-table-column> <el-table-column prop="weight" label="重量" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template> </el-table-column> <el-table-column prop="totalnumber" label="总料" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template> </el-table-column> <el-table-column prop="plan_qty" label="工单数" @@ -537,7 +558,7 @@ :title="operation==='add'?'新增':(operation==='edit'?'修改':'详情')" :visible.sync="dialogVisible" width="1200px" top="8vh" top="3vh" :close-on-click-modal="false" @closed="handleClose" @close="handleClose" @@ -712,6 +733,12 @@ </el-form-item> <el-form-item label="颜色"> <el-input v-model="dialogForm.colour" style="width: 200px" /> </el-form-item> <el-form-item label="重量"> <el-input v-model="dialogForm.weight" style="width: 200px" /> </el-form-item> <el-form-item label="总料"> <el-input v-model="dialogForm.totalnumber" style="width: 200px" /> </el-form-item> <el-divider content-position="left">工序信息</el-divider> @@ -1340,6 +1367,13 @@ </el-form-item> <el-form-item label="颜色:" class="formContent"> {{ formApprove.colour }} </el-form-item> <el-form-item label="重量:" class="formContent"> {{ formApprove.weight }} </el-form-item> <el-form-item label="总料:" class="formContent"> {{ formApprove.totalnumber }} </el-form-item> <!-- <el-form-item label="工艺路线:" class="formContent">--> <!-- {{ formApprove.routename }}--> @@ -2128,6 +2162,9 @@ customername: '', // 客户名称 colour: '', // 颜色 weight: '', // 重量 totalnumber: '', // 总料 mesmaxqty: 0// 工单的最大值 }, customerArr: [], @@ -2186,6 +2223,12 @@ ], colour: [ { required: true, message: '请输入颜色', trigger: ['blur', 'change'] } ], weight: [ { required: true, message: '请输入重量', trigger: ['blur', 'change'] } ], totalnumber: [ { required: true, message: '请输入总料', trigger: ['blur', 'change'] } ] }, @@ -2619,6 +2662,9 @@ this.dialogForm.customercode = row.customercode this.dialogForm.colour = row.colour this.dialogForm.weight = row.weight this.dialogForm.totalnumber = row.totalnumber const data = { sourceid: this.dialogForm.sourceorderid, sourcewo: this.dialogForm.sourceorder, @@ -2720,7 +2766,9 @@ injectnumber: '', customercode: '', colour: '' colour: '', weight: '', totalnumber: '' } this.stepSelectedValue = [] this.stepTableData = [] @@ -2774,6 +2822,9 @@ customercode: this.dialogForm.customercode, customername: this.customerArr.find(i => i.code === this.dialogForm.customercode).name, colour: this.dialogForm.colour, weight: this.dialogForm.weight, totalnumber: this.dialogForm.totalnumber, data_sources: this.dialogForm.data_sources, // 数据来源 isstep: workListSub.length > 0 ? 'Y' : 'N', // @@ -2867,6 +2918,8 @@ this.formApprove.injectnumber = row.injectnumber || '/' this.formApprove.customername = row.customername || '/' this.formApprove.colour = row.colour || '/' this.formApprove.weight = row.weight || '/' this.formApprove.totalnumber = row.totalnumber || '/' this.$nextTick(() => { res3.forEach(i => { src/views/workOrder/workOrderSend.vue
@@ -290,6 +290,27 @@ > <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template> </el-table-column> <el-table-column prop="weight" label="重量" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.weight?row.weight:'/' }}</template> </el-table-column> <el-table-column prop="totalnumber" label="总料" show-tooltip-when-overflow width="110" sortable="custom" > <template slot-scope="{row}">{{ row.totalnumber?row.totalnumber:'/' }}</template> </el-table-column> <el-table-column prop="wkshp_name" label="生产车间" @@ -354,19 +375,14 @@ <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="del(row)" /> </el-tooltip> <el-tooltip class="item" effect="dark" content="打印工单" placement="top"> <!-- <i--> <!-- class="el-icon-tickets"--> <!-- style="cursor: pointer;color: #42b983;margin-right: 15px"--> <!-- @click="check(row)"--> <!-- />--> <i :style="{color:$store.state.settings.theme}" class="el-icon-printer" style="cursor: pointer;margin-right: 15px" @click.stop="handlePrint(row.wo_code)" /> </el-tooltip> <!-- <el-tooltip class="item" effect="dark" content="打印工单" placement="top">--> <!-- <i--> <!-- :style="{color:$store.state.settings.theme}"--> <!-- class="el-icon-printer"--> <!-- style="cursor: pointer;margin-right: 15px"--> <!-- @click.stop="handlePrint(row.wo_code)"--> <!-- />--> <!-- </el-tooltip>--> <el-tooltip class="item" effect="dark" content="详情" placement="top"> <i
