From 6ac64fea29fa0df01f9d0e70372e086de9725aa1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 三月 2024 19:50:01 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/customerorder/index.vue | 669 ++++++++++++++++++++++++++++++---------------------
src/views/plan/manufacturingorder/edit-order-operation.vue | 75 +++--
2 files changed, 438 insertions(+), 306 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 6cad8e6..3b0251a 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -25,8 +25,9 @@
<el-dropdown-item
:key="index"
:command="item.command"
- v-for="(item,index) in documentTagArr"
- :disabled="item.disabled">
+ v-for="(item, index) in documentTagArr"
+ :disabled="item.disabled"
+ >
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
@@ -44,17 +45,18 @@
<el-dropdown-item
:key="index"
:command="item.command"
- v-for="(item,index) in commitStateTagArr"
+ v-for="(item, index) in commitStateTagArr"
:disabled="item.disabled"
>{{ item.label }}</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
<el-button
- style="margin-left:10px;"
+ style="margin-left: 10px"
type="primary"
- @click="()=>exportDialogVisible=true"
- >瀵煎嚭鍙拌处</el-button>
+ @click="() => (exportDialogVisible = true)"
+ >瀵煎嚭鍙拌处</el-button
+ >
</template>
</ttable>
<!-- 寮圭獥, 鏃ユ湡閫夋嫨 -->
@@ -120,7 +122,7 @@
<div>
<div>
<el-upload
- style="margin-left:8px;display: inline;"
+ style="margin-left: 8px; display: inline"
class="upload-demo"
drag
:headers="headers"
@@ -141,7 +143,7 @@
<div class="el-upload__tip" slot="tip">
鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
type="text"
- style="font-size:12px;"
+ style="font-size: 12px"
@click="downDataTemplate"
>涓嬭浇妯℃澘</el-button
>
@@ -154,25 +156,36 @@
<span slot="footer" class="dialog-footer"> </span>
</el-dialog>
<!-- 瀵煎嚭 -->
- <el-dialog title="瀵煎嚭鍙拌处" :visible.sync="exportDialogVisible" width="20%">
- <div style="display: flex;justify-content: center">
- <el-form :model="dataForm" :inline="true" :rules="dataRule" ref="exportForm" class="l-mes">
+ <el-dialog
+ title="瀵煎嚭鍙拌处"
+ :visible.sync="exportDialogVisible"
+ width="20%"
+ >
+ <div style="display: flex; justify-content: center">
+ <el-form
+ :model="dataForm"
+ :inline="true"
+ :rules="dataRule"
+ ref="exportForm"
+ class="l-mes"
+ >
<el-form-item label="鏃ユ湡" prop="exportTime">
<el-date-picker
v-model="dataForm.exportTime"
type="datetime"
- style="width:100%"
+ style="width: 100%"
placeholder="閫夋嫨鏃ユ湡鏃堕棿"
- value-format="yyyy-MM-dd HH:mm:ss">
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
</el-date-picker>
</el-form-item>
</el-form>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="exportDialogVisible=false">鍙� 娑�</el-button>
- <el-button type="primary" @click="exportStandBook">纭� 瀹�</el-button>
- </span>
- </el-dialog>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="exportDialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="exportStandBook">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<!-- 绠辩爜淇℃伅瀵煎嚭 -->
<el-dialog
title="绠辩爜淇℃伅瀵煎嚭"
@@ -185,7 +198,7 @@
ref="packageExportForm"
label-width="70px"
class="l-mes"
- style="padding:0 20px"
+ style="padding: 0 20px"
>
<el-form-item label="璁㈠崟鍙�">
<el-input v-model="packageExport.form.customerOrderNo" disabled />
@@ -225,14 +238,21 @@
</basic-container>
<el-dialog title="閫夋嫨鍚屾鏃ユ湡" :visible.sync="syncDateVisible" width="20%">
- <div style="display: flex;justify-content: center">
- <el-form :model="dataForm" :inline="true" :rules="dataRule" ref="dataForm" class="l-mes">
+ <div style="display: flex; justify-content: center">
+ <el-form
+ :model="dataForm"
+ :inline="true"
+ :rules="dataRule"
+ ref="dataForm"
+ class="l-mes"
+ >
<el-form-item label="鏃ユ湡">
<el-date-picker
v-model="dataForm.selectTime"
type="datetime"
placeholder="閫夋嫨鏃ユ湡鏃堕棿"
- value-format="yyyy-MM-dd HH:mm:ss">
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
</el-date-picker>
</el-form-item>
</el-form>
@@ -243,34 +263,99 @@
</span>
</el-dialog>
<el-dialog
- title="宸插叧鑱旈攢鍞鍗�"
- :visible.sync="showInterrelatedOrderDialog"
- width="60%">
- <el-table border height="100" :data="interrelatedOrderData">
- <el-table-column type="index" align="center" label="搴忓彿"></el-table-column>
- <el-table-column prop="contractNo" show-overflow-tooltip align="center" label="鍚堝悓缂栧彿"></el-table-column>
- <el-table-column prop="entityName" show-overflow-tooltip align="center" label="宸ョ▼鍚嶇О"></el-table-column>
- <el-table-column prop="sourceId" show-overflow-tooltip align="center" label="娣诲姞鏉ユ簮">
- <template scope="scope">
- <el-tag v-if="scope.row.sourceId == 0" type="success">鍚屾</el-tag>
- <el-tag v-if="scope.row.sourceId == 1" type="info">鎵嬪姩</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="placeOrderDate" show-overflow-tooltip align="center" label="涓嬪崟鏃ユ湡"></el-table-column>
- <el-table-column prop="customerName" show-overflow-tooltip align="center" label="瀹㈡埛鍚嶇О"></el-table-column>
- <el-table-column prop="coState" min-width="100" show-overflow-tooltip align="center" label="閿�鍞鍗曠姸鎬�"></el-table-column>
- <el-table-column prop="partNo" show-overflow-tooltip align="center" label="浜у搧缂栧彿"></el-table-column>
- <el-table-column prop="productName" show-overflow-tooltip align="center" label="浜у搧鍚嶇О"></el-table-column>
- <el-table-column prop="productType" show-overflow-tooltip align="center" label="闅跺睘鍝佺墝"></el-table-column>
- <el-table-column prop="otcUnit" show-overflow-tooltip align="center" label="鍗曚綅"></el-table-column>
- <el-table-column prop="buyQtyDue" show-overflow-tooltip align="center" label="鏁伴噺"></el-table-column>
- </el-table>
+ title="宸插叧鑱旈攢鍞鍗�"
+ :visible.sync="showInterrelatedOrderDialog"
+ width="60%"
+ >
+ <el-table border height="100" :data="interrelatedOrderData">
+ <el-table-column
+ type="index"
+ align="center"
+ label="搴忓彿"
+ ></el-table-column>
+ <el-table-column
+ prop="contractNo"
+ show-overflow-tooltip
+ align="center"
+ label="鍚堝悓缂栧彿"
+ ></el-table-column>
+ <el-table-column
+ prop="entityName"
+ show-overflow-tooltip
+ align="center"
+ label="宸ョ▼鍚嶇О"
+ ></el-table-column>
+ <el-table-column
+ prop="sourceId"
+ show-overflow-tooltip
+ align="center"
+ label="娣诲姞鏉ユ簮"
+ >
+ <template scope="scope">
+ <el-tag v-if="scope.row.sourceId == 0" type="success">鍚屾</el-tag>
+ <el-tag v-if="scope.row.sourceId == 1" type="info">鎵嬪姩</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="placeOrderDate"
+ show-overflow-tooltip
+ align="center"
+ label="涓嬪崟鏃ユ湡"
+ ></el-table-column>
+ <el-table-column
+ prop="customerName"
+ show-overflow-tooltip
+ align="center"
+ label="瀹㈡埛鍚嶇О"
+ ></el-table-column>
+ <el-table-column
+ prop="coState"
+ min-width="100"
+ show-overflow-tooltip
+ align="center"
+ label="閿�鍞鍗曠姸鎬�"
+ ></el-table-column>
+ <el-table-column
+ prop="partNo"
+ show-overflow-tooltip
+ align="center"
+ label="浜у搧缂栧彿"
+ ></el-table-column>
+ <el-table-column
+ prop="productName"
+ show-overflow-tooltip
+ align="center"
+ label="浜у搧鍚嶇О"
+ ></el-table-column>
+ <el-table-column
+ prop="productType"
+ show-overflow-tooltip
+ align="center"
+ label="闅跺睘鍝佺墝"
+ ></el-table-column>
+ <el-table-column
+ prop="otcUnit"
+ show-overflow-tooltip
+ align="center"
+ label="鍗曚綅"
+ ></el-table-column>
+ <el-table-column
+ prop="buyQtyDue"
+ show-overflow-tooltip
+ align="center"
+ label="鏁伴噺"
+ ></el-table-column>
+ </el-table>
</el-dialog>
</div>
</template>
<script>
-import {interrelatedOrder,getInterrelatedOrder,checkHanderOrder} from '@/api/plan/customerOrderInterrelated'
+import {
+ interrelatedOrder,
+ getInterrelatedOrder,
+ checkHanderOrder,
+} from '@/api/plan/customerOrderInterrelated'
import ConfirmPullCustomerorder from './confirm-pull-customerorder'
import TableForm from './customerorder-form'
import TableFormDEesc from './customerorder-form-desc'
@@ -318,10 +403,12 @@
uniqueStateArr: [],
dataForm: {
selectTime: null,
- exportTime: null
+ exportTime: null,
},
dataRule: {
- exportTime:[{required:true,message:'瀵煎嚭鏃ユ湡涓嶈兘涓虹┖',trigger:'change'}]
+ exportTime: [
+ { required: true, message: '瀵煎嚭鏃ユ湡涓嶈兘涓虹┖', trigger: 'change' },
+ ],
},
pickerOptions: {
onPick: ({ maxDate, minDate }) => {
@@ -339,7 +426,7 @@
)
}
return false
- }
+ },
},
exportDialogVisible: false,
syncDateVisible: false,
@@ -352,58 +439,58 @@
label: '鏍囪闆朵欢寰呴��',
command: '01partUnCheck',
disabled: false,
- permitArr: []
+ permitArr: [],
},
{
label: '鏍囪宸ヨ壓鏂囦欢寰呴��',
command: '02technologyUnCheck',
disabled: false,
- permitArr: []
+ permitArr: [],
},
{
label: '鏍囪寰呰鍒�',
command: '03plan',
disabled: false,
- permitArr: []
+ permitArr: [],
},
{
label: '鏍囪宸蹭笅鍙�',
command: '04planed',
disabled: false,
- permitArr: []
+ permitArr: [],
},
{
label: '鏍囪宸蹭綔搴�',
command: '05cancel',
disabled: false,
- permitArr: []
- }
+ permitArr: [],
+ },
],
documentTagArr: [
{
label: '鍏宠仈宸ヨ壓鏂囦欢',
command: 'RELEVANCE',
- disabled: false
+ disabled: false,
},
{
label: '绉婚櫎宸ヨ壓鏂囦欢',
command: 'NORELEVANCE',
- disabled: false
- }
+ disabled: false,
+ },
],
commitStateTagArr: [
{
label: '鏍囪閫氳繃',
command: 'PROCESSED',
disabled: false,
- permitArr: ['01draft']
+ permitArr: ['01draft'],
},
{
label: '鏍囪鍙栨秷',
command: 'CANCELED',
disabled: false,
- permitArr: ['01draft']
- }
+ permitArr: ['01draft'],
+ },
],
ajaxFun: fetchListCustomerOrder,
events: '',
@@ -415,7 +502,7 @@
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
isShow: false,
- url: ''
+ url: '',
},
prelang: 'operation',
options: {
@@ -431,7 +518,7 @@
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'placeOrderDate', direction: 'desc' },
- cancelRunCreated: true
+ cancelRunCreated: true,
},
table: {
total: 0,
@@ -449,7 +536,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
- render: { fun: this.addOrUpdateHandle }
+ render: { fun: this.addOrUpdateHandle },
},
{
minWidth: '120',
@@ -457,7 +544,7 @@
label: '宸ョ▼鍚嶇О',
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '120',
@@ -466,7 +553,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '100',
@@ -479,7 +566,7 @@
formatter: this.getSourceId,
optList: () => {
return this.sourceIdList
- }
+ },
},
{
minWidth: '200',
@@ -490,7 +577,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'datetimerange',
- formatter: this.formatDutyDate
+ formatter: this.formatDutyDate,
},
{
minWidth: '120',
@@ -500,7 +587,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
- formatter: this.formatDutyDate
+ formatter: this.formatDutyDate,
},
{
minWidth: '120',
@@ -509,7 +596,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '120',
@@ -522,7 +609,7 @@
formatter: this.getCustomerCoState,
optList: () => {
return this.coStateList
- }
+ },
},
{
minWidth: '120',
@@ -535,7 +622,7 @@
formatter: this.getIsAudit,
optList: () => {
return this.isAuditList
- }
+ },
},
{
minWidth: '120',
@@ -547,8 +634,21 @@
searchInfoType: 'select',
formatter: this.checkIsPass,
optList: () => {
- return this.isPassList
- }
+ return this.isPassList
+ },
+ },
+ {
+ minWidth: '120',
+ prop: 'isOa',
+ label: '鏄惁鎻愪氦oa',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'select',
+ formatter: this.checkIsOa,
+ optList: () => {
+ return this.isOaList
+ },
},
{
minWidth: '120',
@@ -558,7 +658,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '120',
@@ -568,7 +668,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '120',
@@ -577,7 +677,7 @@
label: '闅跺睘鍝佺墝',
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '120',
@@ -586,7 +686,7 @@
label: '鍗曚綅',
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '120',
@@ -596,7 +696,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '120',
@@ -605,7 +705,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '140',
@@ -618,7 +718,7 @@
formatter: this.getManufactureAttr,
optList: () => {
return this.manufactureAttrList
- }
+ },
},
{
minWidth: '140',
@@ -627,7 +727,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '140',
@@ -636,7 +736,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '140',
@@ -645,7 +745,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '140',
@@ -654,7 +754,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
{
minWidth: '140',
@@ -665,7 +765,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'datetimerange',
- formatter: this.formatDutyDate
+ formatter: this.formatDutyDate,
},
],
toolbar: [],
@@ -693,13 +793,13 @@
type: 'text',
size: 'small',
fun: this.checkHandOrder,
- showFun: (row)=>{return row.sourceId==='1'},
+ showFun: (row) => {
+ return row.sourceId === '1'
+ },
show: {
- val: [
- false,
- ],
- key: 'isPass'
- }
+ val: [false],
+ key: 'isPass',
+ },
},
{
text: '宸插叧鑱旇鍗�',
@@ -716,82 +816,89 @@
val: [
'01partUnCheck',
'02technologyUnCheck',
- '03plan'
+ '03plan',
// '04planed'
],
- key: 'coState'
- }
- }
+ key: 'coState',
+ },
+ },
],
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
width: 200,
- minWidth: 200
- }
+ minWidth: 200,
+ },
},
addOrUpdateVisible: false,
coStateList: [
{
value: '01partUnCheck',
- label: '闆朵欢寰呴��'
+ label: '闆朵欢寰呴��',
},
{
value: '02technologyUnCheck',
- label: '宸ヨ壓鏂囦欢寰呴��'
+ label: '宸ヨ壓鏂囦欢寰呴��',
},
{
value: '03plan',
- label: '寰呰鍒�'
+ label: '寰呰鍒�',
},
{
value: '04planed',
- label: '宸蹭笅鍙�'
+ label: '宸蹭笅鍙�',
},
{
value: '05cancel',
- label: '宸蹭綔搴�'
+ label: '宸蹭綔搴�',
},
{
value: '06unedit',
- label: '璁㈠崟缂栬緫'
- }
+ label: '璁㈠崟缂栬緫',
+ },
],
- manufactureAttrList: [{
- label: '鏅��',
- value: 'N'
- },{
- label: '鏍峰搧',
- value: 'S'
- },{
- label: '鐮斿彂',
- value: 'D'
- }],
+ manufactureAttrList: [
+ {
+ label: '鏅��',
+ value: 'N',
+ },
+ {
+ label: '鏍峰搧',
+ value: 'S',
+ },
+ {
+ label: '鐮斿彂',
+ value: 'D',
+ },
+ ],
isAuditList: [
{
value: '01draft',
- label: '鑽夌'
+ label: '鑽夌',
},
{
value: '02pending',
- label: '瀹℃牳涓�'
+ label: '瀹℃牳涓�',
},
{
value: '03accepted',
- label: '閫氳繃'
+ label: '閫氳繃',
},
{
value: '04reject',
- label: '閫�鍥�'
- }
+ label: '閫�鍥�',
+ },
],
- sourceIdList: [{
- label: '鍚屾',
- value: "0"
- },{
- label: '鎵嬪姩',
- value: "1"
- }],
+ sourceIdList: [
+ {
+ label: '鍚屾',
+ value: '0',
+ },
+ {
+ label: '鎵嬪姩',
+ value: '1',
+ },
+ ],
stockVisible: false,
partName: null,
showPullCustomerOrderVisible: false,
@@ -803,20 +910,20 @@
id: '',
customerOrderNo: '',
splitQuantity: '',
- title: ''
+ title: '',
},
rules: {
splitQuantity: [
{ required: true, message: '鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' },
- { validator: validateSixDecimal, trigger: 'blur' }
+ { validator: validateSixDecimal, trigger: 'blur' },
],
- title: [{ required: true, message: '鎶ご涓嶈兘涓虹┖', trigger: 'blur' }]
+ title: [{ required: true, message: '鎶ご涓嶈兘涓虹┖', trigger: 'blur' }],
},
titleList: [],
- buttonDisable: false
+ buttonDisable: false,
},
headers: {
- Authorization: 'Bearer ' + getStore({ name: 'access_token' })
+ Authorization: 'Bearer ' + getStore({ name: 'access_token' }),
},
fileList: [],
outBatchUploadUrl: '/mes/operationTaskProduce/upload',
@@ -825,16 +932,23 @@
otcPartSyncOptionList: [
{
value: true,
- label: '宸插悓姝�'
+ label: '宸插悓姝�',
},
{
value: false,
- label: '鏈悓姝�'
- }
+ label: '鏈悓姝�',
+ },
],
showSalesPartBatch: false,
addOrUpdateEescVisible: false,
- isPassList: [{label:'鏈�氳繃',value: false},{label: '閫氳繃',value: true}]
+ isPassList: [
+ { label: '鏈�氳繃', value: false },
+ { label: '閫氳繃', value: true },
+ ],
+ isOaList: [
+ { label: '鏈彁浜�', value: false },
+ { label: '宸叉彁浜�', value: true },
+ ],
}
},
components: {
@@ -848,10 +962,10 @@
SampleTableForm,
SalesPartBatchDialog,
TableFormDEesc,
- CustomerorderReturnDialog
+ CustomerorderReturnDialog,
},
computed: {
- ...mapGetters(['permissions'])
+ ...mapGetters(['permissions']),
},
watch: {
exportDialogVisible(newVal) {
@@ -865,19 +979,21 @@
this.getData()
}
},
- immediate: true
+ immediate: true,
},
- interrelatedOrderId(newVal){
- if(newVal){
- getInterrelatedOrder(newVal).then(res=>{
- if(res.status===200){
- this.interrelatedOrderData = res.data.data
- }
- }).catch(error=>{
- console.error(error)
- })
- }
- }
+ interrelatedOrderId(newVal) {
+ if (newVal) {
+ getInterrelatedOrder(newVal)
+ .then((res) => {
+ if (res.status === 200) {
+ this.interrelatedOrderData = res.data.data
+ }
+ })
+ .catch((error) => {
+ console.error(error)
+ })
+ }
+ },
},
mounted() {
this.initQueryParams()
@@ -890,7 +1006,7 @@
type: 'primary',
fun: this.addSampleCustomerOrder,
disabled: false,
- permitArr: []
+ permitArr: [],
})
if (this.permissions.customerorder_from_otc) {
this.table.toolbar.push({
@@ -898,17 +1014,17 @@
type: 'primary',
fun: this.syncERP,
disabled: false,
- permitArr: []
+ permitArr: [],
})
}
if (this.permissions.customerorder_submit_oa) {
this.table.toolbar.push({
- text: '鎻愪氦瀹℃牳',
+ text: '鎻愪氦OA',
type: 'primary',
fun: this.auditCustomerOrder,
disabled: false,
permitArr: [],
- loading: false
+ loading: false,
})
}
if (this.permissions.customerorder_set_salesparts) {
@@ -917,7 +1033,7 @@
type: 'primary',
fun: this.setSalesPart,
disabled: false,
- permitArr: []
+ permitArr: [],
})
}
this.table.toolbar.push({
@@ -935,71 +1051,77 @@
fun: this.downloadProductionScheduling,
})
this.table.toolbar.push({
- text: '鍏宠仈璁㈠崟',
- disabled: false,
- type: 'primary',
- fun: this.interrelatedOrderFun,
- permitArr: [],
+ text: '鍏宠仈璁㈠崟',
+ disabled: false,
+ type: 'primary',
+ fun: this.interrelatedOrderFun,
+ permitArr: [],
})
if (this.permissions.customerorder_create_masterplan) {
this.table.toolbar.push({
text: '涓荤敓浜ц鍒�',
disabled: false,
fun: this.masterPlanHandle,
- permitArr: []
+ permitArr: [],
})
}
},
methods: {
- checkHandOrder(val){
- this.$confirm('纭瀹℃牳閫氳繃璇ラ攢鍞鍗曞悧?', '鎻愮ず', {
- confirmButtonText: '閫氳繃',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- checkHanderOrder(val).then(res=>{
- if(res.status===200){
- this.$message.success("瀹℃牳閫氳繃")
+ checkHandOrder(val) {
+ this.$confirm('纭瀹℃牳閫氳繃璇ラ攢鍞鍗曞悧?', '鎻愮ず', {
+ confirmButtonText: '閫氳繃',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ })
+ .then(() => {
+ checkHanderOrder(val)
+ .then((res) => {
+ if (res.status === 200) {
+ this.$message.success('瀹℃牳閫氳繃')
this.getData()
- }
- }).catch(error=>{
- console.error(error)
- })
- }).catch(() => {});
- },
- interrelatedOrderFun(){
- if(this.multipleSelection.length!=2){
- this.$message.error("璇烽�夋嫨涓ゆ潯閿�鍞鍗�")
- return
- }
- let autoId = null
- let handId = null
- this.multipleSelection.forEach(ele=>{
- if(ele.sourceId==0){
- autoId = ele.id
- }else if(ele.sourceId==1){
- handId = ele.id
- }
+ }
+ })
+ .catch((error) => {
+ console.error(error)
+ })
})
- if(autoId==null || handId==null){
- this.$message.error("娣诲姞鏉ユ簮椤讳负鎵嬪姩鍜屽悓姝�")
- return
+ .catch(() => {})
+ },
+ interrelatedOrderFun() {
+ if (this.multipleSelection.length != 2) {
+ this.$message.error('璇烽�夋嫨涓ゆ潯閿�鍞鍗�')
+ return
+ }
+ let autoId = null
+ let handId = null
+ this.multipleSelection.forEach((ele) => {
+ if (ele.sourceId == 0) {
+ autoId = ele.id
+ } else if (ele.sourceId == 1) {
+ handId = ele.id
}
- interrelatedOrder({
- customerOrderAutoId: autoId,
- customerOrderHandId: handId
- }).then(res=>{
- if(res.status===200){
- this.$message.success("鍏宠仈鎴愬姛")
- }
- }).catch(error=>{
- console.error(error)
+ })
+ if (autoId == null || handId == null) {
+ this.$message.error('娣诲姞鏉ユ簮椤讳负鎵嬪姩鍜屽悓姝�')
+ return
+ }
+ interrelatedOrder({
+ customerOrderAutoId: autoId,
+ customerOrderHandId: handId,
+ })
+ .then((res) => {
+ if (res.status === 200) {
+ this.$message.success('鍏宠仈鎴愬姛')
+ }
+ })
+ .catch((error) => {
+ console.error(error)
})
},
//灞曠ず宸插叧鑱旇鍗�
- showInterrelatedOrder(currentOrder){
- this.interrelatedOrderId = currentOrder.id
- this.showInterrelatedOrderDialog = true
+ showInterrelatedOrder(currentOrder) {
+ this.interrelatedOrderId = currentOrder.id
+ this.showInterrelatedOrderDialog = true
},
//涓嬭浇鎺掍骇閫氱煡鍗�
downloadProductionScheduling(){
@@ -1028,17 +1150,18 @@
const blob = response.data
const link = document.createElement('a')
link.href = URL.createObjectURL(blob)
- const disposition = response.headers["content-disposition"]
+ const disposition = response.headers['content-disposition']
let temp = disposition.substring(disposition.lastIndexOf('=') + 1)
link.download = decodeURI(temp)
document.body.appendChild(link)
link.click()
- window.setTimeout(function() {
+ window.setTimeout(function () {
URL.revokeObjectURL(blob)
document.body.removeChild(link)
}, 0)
- }).catch(error=>{
- console.error(error);
+ })
+ .catch((error) => {
+ console.error(error)
})
},
getOtcPartSyncOptionList() {
@@ -1049,7 +1172,7 @@
queryParam.push(
Object.assign({
prop: 'coState',
- searchInfoType: 'select'
+ searchInfoType: 'select',
// propVal: '01partUnCheck'
// propVal: '02technologyUnCheck'
})
@@ -1105,17 +1228,17 @@
this.$message.error('璇烽�夋嫨閿�鍞鍗�')
}
},
- checkIsPass(row, column, cellValue){
- this.isPassList.forEach((obj) => {
- if (obj.value === cellValue) {
- if(obj.value){
- cellValue = "<span style='color:#34BD66;'>"+obj.label+"</span>"
- }else{
- cellValue = "<span style='color:#E84738;'>"+obj.label+"</span>"
- }
- }
- })
- return cellValue
+ checkIsPass(row, column, cellValue) {
+ this.isPassList.forEach((obj) => {
+ if (obj.value === cellValue) {
+ if (obj.value) {
+ cellValue = "<span style='color:#34BD66;'>" + obj.label + '</span>'
+ } else {
+ cellValue = "<span style='color:#E84738;'>" + obj.label + '</span>'
+ }
+ }
+ })
+ return cellValue
},
formatDutyDate(row, column, cellValue) {
if (cellValue) {
@@ -1128,15 +1251,15 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
- if(row.isPass){
+ if (row.isPass) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
- this.$refs.addOrUpdate.init(row ? row.id : row)
+ this.$refs.addOrUpdate.init(row ? row.id : row)
})
- }else{
+ } else {
this.addSampleVisible = true
this.$nextTick(() => {
- this.$refs.addSampleForm.init(row ? row.contractNo : null)
+ this.$refs.addSampleForm.init(row ? row.contractNo : null)
})
}
},
@@ -1201,46 +1324,34 @@
// 瀹℃牳閿�鍞鍗�
auditCustomerOrder() {
if (this.multipleSelection.length > 0) {
- if (this.judgeCoState(this.multipleSelection)) {
- let flag = true
- const ids = []
- this.multipleSelection.forEach((item) => {
- if (item.partNo != null && item.partNo !== '') {
- ids.push(item.id)
- } else {
- flag = false
- }
- })
- if (flag) {
-
- checkOA(this.multipleSelection.map((e) => e.id),{}).then((res) => {
- if (!res.data.data.success) {
- this.$confirm(`${res.data.data.message}`, '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- closeOnClickModal: false,
- type: 'warning'
- }).then(() => {
- this.auditCustomerOrderSure(ids)
- })
- } else {
- this.auditCustomerOrderSure(ids)
- }
- })
+ let flag = true
+ const ids = []
+ this.multipleSelection.forEach((item) => {
+ if (item.partNo != null && item.partNo !== '') {
+ ids.push(item.id)
} else {
- this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛�')
+ flag = false
}
+ })
+ if (flag) {
+ checkOA(
+ this.multipleSelection.map((e) => e.id)
+ ).then((res) => {
+ if (res.data.data.success) {
+ this.auditCustomerOrderSure(ids)
+ }
+ }).catch(error=>{
+ this.$message.error(error.message)
+ })
} else {
- this.$message.error('閿�鍞鍗曞鏍哥姸鎬佷负浣滃簾锛屼笉鍙繘琛屾搷浣滐紒')
+ this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾闆朵欢鍙凤紒')
}
} else {
this.$message.error('璇峰厛鍕鹃�夐攢鍞鍗曪紒')
}
},
auditCustomerOrderSure(ids) {
- const toolbar = this.table.toolbar.find(
- (item) => item.text === '鎻愪氦瀹℃牳'
- )
+ const toolbar = this.table.toolbar.find((item) => item.text === '鎻愪氦OA')
if (toolbar) {
toolbar.loading = true
auditCustomerOrder(ids)
@@ -1250,7 +1361,7 @@
this.$message.success(resData.msg)
this.getData()
} else {
- this.$message.error('鎻愪氦瀹℃牳澶辫触锛�')
+ this.$message.error('鎻愪氦OA澶辫触锛�')
}
toolbar.loading = false
})
@@ -1268,7 +1379,7 @@
id: row.id,
customerOrderNo: row.customerOrderNo,
splitQuantity: '',
- title: ''
+ title: '',
}
this.$nextTick(() => {
this.$refs.packageExportForm.resetFields()
@@ -1284,7 +1395,7 @@
exportCustomerOrderSplit({
id: this.packageExport.form.id,
splitQuantity: this.packageExport.form.splitQuantity,
- title: this.packageExport.form.title
+ title: this.packageExport.form.title,
})
.then((response) => {
transform(response)
@@ -1298,13 +1409,13 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('纭浣滃簾id涓恒��' + row.id + '銆戠殑鏁版嵁?','鎻愮ず' , {
+ this.$confirm('纭浣滃簾id涓恒��' + row.id + '銆戠殑鏁版嵁?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
- type: 'warning'
+ type: 'warning',
}).then(() => {
- dropByContractNo({id:row.id}).then((res) => {
+ dropByContractNo({ id: row.id }).then((res) => {
if (res.data.code === 0) {
this.$message.success('浣滃簾鎴愬姛')
this.getData()
@@ -1339,7 +1450,7 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
- type: 'warning'
+ type: 'warning',
})
.then(() => {
return delCustomerOrder(row.id)
@@ -1353,7 +1464,7 @@
handleSelectionChange(val) {
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
- var stateArr = val.map(function(value, index) {
+ var stateArr = val.map(function (value, index) {
return value.coState
})
// 閫変腑鐘舵�佹暟缁勫厓绱犲幓閲�
@@ -1438,6 +1549,14 @@
},
getIsAudit(row, column, cellValue) {
this.isAuditList.forEach((obj) => {
+ if (obj.value === cellValue) {
+ cellValue = obj.label
+ }
+ })
+ return cellValue
+ },
+ checkIsOa(row, column, cellValue) {
+ this.isOaList.forEach((obj) => {
if (obj.value === cellValue) {
cellValue = obj.label
}
@@ -1567,9 +1686,9 @@
} else {
if (this.judgeCoState(this.multipleSelection)) {
if (event == 'RELEVANCE') {
- if(!this.multipleSelection[0].isPass){
- this.$message.error("璇峰厛瀹℃牳閫氳繃锛屽啀鍏宠仈宸ヨ壓鏂囦欢")
- return
+ if (!this.multipleSelection[0].isPass) {
+ this.$message.error('璇峰厛瀹℃牳閫氳繃锛屽啀鍏宠仈宸ヨ壓鏂囦欢')
+ return
}
const firstPartNo = this.multipleSelection[0].partNo
this.multipleSelection.forEach((item) => {
@@ -1663,7 +1782,7 @@
if (!isLt10M) {
this.$message({
message: '鏂囦欢澶у皬',
- type: 'warning'
+ type: 'warning',
})
}
return isLt10M
@@ -1675,7 +1794,7 @@
} else {
this.$message({
message: '涓婁紶鎴愬姛',
- type: 'success'
+ type: 'success',
})
this.getData()
}
@@ -1693,7 +1812,7 @@
downDataTemplate() {
uploadBatchTemplate().then((response) => {
const blob = new Blob([response.data], {
- type: 'application/force-download'
+ type: 'application/force-download',
})
const filename = decodeURI('妯℃澘鏂囦欢.xlsx')
// 鍒涘缓涓�涓秴閾炬帴锛屽皢鏂囦欢娴佽祴杩涘幓锛岀劧鍚庡疄鐜拌繖涓秴閾炬帴鐨勫崟鍑讳簨浠�
@@ -1733,10 +1852,10 @@
// } else {
// this.$message.error('璇烽�夋嫨鑷冲皯涓�鏉￠攢鍞鍗�')
// }
- this.$refs['exportForm'].validate(valid => {
- if(valid){
+ this.$refs['exportForm'].validate((valid) => {
+ if (valid) {
const exportTime = this.dataForm.exportTime
- let queryParam=this.$refs.customerOrderTable.getQueryParam();
+ let queryParam = this.$refs.customerOrderTable.getQueryParam()
queryParam.selectTime = exportTime
exportCustomerOrder(queryParam)
.then((response) => {
@@ -1778,7 +1897,7 @@
if (this.dataForm.selectTime != null && this.dataForm.selectTime != '') {
otcCustomerOrderSync({
selectTime: this.dataForm.selectTime,
- pathCode: '1'
+ pathCode: '1',
})
.then((response) => {
this.table.toolbar.find(
@@ -1806,7 +1925,7 @@
).loading = false
this.$message.error('璇峰厛閫夋嫨鏃ユ湡')
}
- }
- }
+ },
+ },
}
</script>
diff --git a/src/views/plan/manufacturingorder/edit-order-operation.vue b/src/views/plan/manufacturingorder/edit-order-operation.vue
index 8454b08..8ac91c1 100644
--- a/src/views/plan/manufacturingorder/edit-order-operation.vue
+++ b/src/views/plan/manufacturingorder/edit-order-operation.vue
@@ -36,15 +36,17 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
- <el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb">
+ <el-form-item label="鏄惁涓撴" prop="isSpecialIns">
<el-select
- v-model="dataForm.runTimeCodeDb"
- placeholder="鍥犵礌鍗曚綅"
+ v-model="dataForm.isSpecialIns"
+ placeholder="鏄惁涓撴"
style="width: 100%"
>
<el-option
- v-for="item in runTimeCodeDbOptions"
+ v-for="item in isSpecialIns"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -53,7 +55,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="12">
<el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor">
<el-input
@@ -136,7 +138,7 @@
</el-form-item>
</el-col>
<el-col :span="12"> </el-col>
- </el-row>
+ </el-row> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="innerVisible = false">鍙� 娑�</el-button>
@@ -152,20 +154,20 @@
props: {
currshowlist: {
type: Boolean,
- default: false
+ default: false,
},
currOrderOperation: {
type: Object,
default: () => {
return {}
- }
- }
+ },
+ },
},
data() {
return {
innerVisible: false,
workCenterOptions: [],
- runTimeCodeDbOptions: [],
+ isSpecialIns: [{ label: '鏄�', value: true} ,{label: '鍚�', value: false }],
dataForm: {
id: 0,
workCenter: null,
@@ -177,34 +179,34 @@
runTimeCodeDb: null,
crewSize: 1,
outsideOpItem: null,
- moId: null
+ moId: null,
},
dataRule: {
workCenter: [
- { required: true, message: '宸ヤ綔涓績涓嶈兘涓虹┖', trigger: 'change' }
+ { required: true, message: '宸ヤ綔涓績涓嶈兘涓虹┖', trigger: 'change' },
],
machRunFactor: [
{ required: true, message: '鏈哄櫒杩愯浆鍥犵礌涓嶈兘涓虹┖', trigger: 'blur' },
- { validator: validateSixDecimalPositives, trigger: 'blur' }
+ { validator: validateSixDecimalPositives, trigger: 'blur' },
],
machSetupTime: [
{ required: true, message: '鏈哄櫒璁剧疆鏃堕棿涓嶈兘涓虹┖', trigger: 'blur' },
- { validator: validateSixDecimalPositives, trigger: 'blur' }
+ { validator: validateSixDecimalPositives, trigger: 'blur' },
],
laborRunFactor: [
{ required: true, message: '鍔冲姏杩愯浆鍥犵礌涓嶈兘涓虹┖', trigger: 'blur' },
- { validator: validateSixDecimalPositives, trigger: 'blur' }
+ { validator: validateSixDecimalPositives, trigger: 'blur' },
],
laborSetupTime: [
{ required: true, message: '鍔冲姏璁剧疆鏃堕棿涓嶈兘涓虹┖', trigger: 'blur' },
- { validator: validateSixDecimalPositives, trigger: 'blur' }
+ { validator: validateSixDecimalPositives, trigger: 'blur' },
],
runTimeCodeDb: [
- { required: true, message: '鍥犵礌鍗曚綅涓嶈兘涓虹┖', trigger: 'change' }
- ]
+ { required: true, message: '鍥犵礌鍗曚綅涓嶈兘涓虹┖', trigger: 'change' },
+ ],
},
laborClassNoOptions: [],
- outsideOpItemOptions: []
+ outsideOpItemOptions: [],
}
},
methods: {
@@ -253,14 +255,21 @@
const data = response.data
if (data.code === 0) {
this.currOrderOperation.workCenter = this.dataForm.workCenter
- this.currOrderOperation.machRunFactor = this.dataForm.machRunFactor
- this.currOrderOperation.machSetupTime = this.dataForm.machSetupTime
- this.currOrderOperation.laborClassNo = this.dataForm.laborClassNo
- this.currOrderOperation.laborRunFactor = this.dataForm.laborRunFactor
- this.currOrderOperation.laborSetupTime = this.dataForm.laborSetupTime
- this.currOrderOperation.runTimeCodeDb = this.dataForm.runTimeCodeDb
+ this.currOrderOperation.machRunFactor =
+ this.dataForm.machRunFactor
+ this.currOrderOperation.machSetupTime =
+ this.dataForm.machSetupTime
+ this.currOrderOperation.laborClassNo =
+ this.dataForm.laborClassNo
+ this.currOrderOperation.laborRunFactor =
+ this.dataForm.laborRunFactor
+ this.currOrderOperation.laborSetupTime =
+ this.dataForm.laborSetupTime
+ this.currOrderOperation.runTimeCodeDb =
+ this.dataForm.runTimeCodeDb
this.currOrderOperation.crewSize = this.dataForm.crewSize
- this.currOrderOperation.outsideOpItem = this.dataForm.outsideOpItem
+ this.currOrderOperation.outsideOpItem =
+ this.dataForm.outsideOpItem
this.innerVisible = false
this.$message.success('缂栬緫鎴愬姛')
} else {
@@ -308,7 +317,7 @@
this.outsideOpItemOptions = []
}
})
- }
+ },
},
watch: {
currshowlist() {
@@ -334,8 +343,10 @@
this.dataForm.machRunFactor = this.currOrderOperation.machRunFactor
this.dataForm.machSetupTime = this.currOrderOperation.machSetupTime
this.dataForm.laborClassNo = this.currOrderOperation.laborClassNo
- this.dataForm.laborRunFactor = this.currOrderOperation.laborRunFactor
- this.dataForm.laborSetupTime = this.currOrderOperation.laborSetupTime
+ this.dataForm.laborRunFactor =
+ this.currOrderOperation.laborRunFactor
+ this.dataForm.laborSetupTime =
+ this.currOrderOperation.laborSetupTime
this.dataForm.runTimeCodeDb =
this.currOrderOperation.runTimeCodeDb == null
? '2'
@@ -343,11 +354,13 @@
this.dataForm.crewSize = this.currOrderOperation.crewSize
this.dataForm.outsideOpItem = this.currOrderOperation.outsideOpItem
this.dataForm.moId = this.currOrderOperation.moId
+ this.dataForm.isSpecialIns = this.currOrderOperation.isSpecialIns
+
})
})
}
- }
- }
+ },
+ },
}
</script>
<style>
--
Gitblit v1.9.3