From 4a6d69f3ff895918b1b8f1e8e9b122ed8fcd5afa Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 24 十一月 2022 17:15:47 +0800
Subject: [PATCH] 1.自动排程实现静态部分
---
src/views/scgl/scdd.vue | 57 ++++++++
src/views/scgl/zdpc.vue | 135 +++++++++++++++------
src/views/scgl/cngh.vue | 10 +
src/views/scgl/gd.vue | 94 ++++++++-------
src/views/zzmx/jpgj.vue | 7
src/views/zzmx/wlqd.vue | 46 +++----
src/api/scgl.js | 8 +
7 files changed, 241 insertions(+), 116 deletions(-)
diff --git a/src/api/scgl.js b/src/api/scgl.js
index 0215959..5fd521a 100644
--- a/src/api/scgl.js
+++ b/src/api/scgl.js
@@ -366,3 +366,11 @@
data
})
}
+// 鐢熶骇绠＄悊銆佸伐鍗曟柊澧炪�佺紪杈戞椂,閫夋嫨鎺掔▼鏄椂鑾峰彇鐗╂枡娓呭崟鐗堟湰鍙�
+export function JobCreationSonAddVison(data) {
+ return request({
+ url: 'ProductionManagement/JobCreationSonAddVison',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/views/scgl/cngh.vue b/src/views/scgl/cngh.vue
index 733848f..8e49ea7 100644
--- a/src/views/scgl/cngh.vue
+++ b/src/views/scgl/cngh.vue
@@ -125,7 +125,9 @@
min-width="300"
>
<template slot-scope="{row}">
+ <el-input v-if="row.CaptPlanWorkShift===null" :disabled="row.CaptPlanWorkShift===null" />
<date-picker
+ v-else
v-model="row.CaptPlanShopCalendarList"
:row-data="row"
style="width: 100%;"
@@ -203,6 +205,7 @@
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ @row-click="rowClick"
>
<el-table-column
@@ -214,8 +217,9 @@
v-model="radioSelectedCode"
:label="row.code"
style="padding-left: 10px;"
- @change.native="getCurrentRowSource(row.code)"
/>
+ <!-- @change.native="getCurrentRowSource(row.code)"-->
+
</template>
</el-table-column>
<el-table-column
@@ -659,6 +663,10 @@
this.getHeight()
},
methods: {
+ // 琛岀偣鍑讳簨浠�
+ rowClick(row, event, column) {
+ this.radioSelectedCode = row.code
+ },
// 瀛愮粍浠跺け鐒︽椂鎵ц
over(val) {
if (val) {
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 1730c68..6117cb5 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -169,6 +169,8 @@
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
<div v-if="row.status==='START'">寮�宸�</div>
<div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>
+ <div v-if="row.status==='SCHED'">宸叉帓绋�</div>
</template>
</el-table-column>
<el-table-column
@@ -182,7 +184,12 @@
label="婧愬崟鍗曞彿"
sortable="custom"
min-width="160"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.m_po">{{ row.m_po }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="wotype"
label="鍗曟嵁绫诲瀷"
@@ -588,19 +595,26 @@
</el-select>
</el-form-item>
</div>
- <el-form-item label="鐗╂枡娓呭崟" prop="bomId">
+ <el-form-item label="鏄惁鎺掔▼" prop="isAps">
+ <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
+ <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
+ <el-radio key="N" label="N" value="N">鍚�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">
<el-select
v-model="dialogForm.bomId"
filterable
+ :disabled="dialogForm.isAps==='N'"
:popper-append-to-body="false"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
v-for="item in bomIdArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ :key="item.id"
+ :label="item.version"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -610,6 +624,7 @@
type="date"
:clearable="false"
value-format="yyyy-MM-dd"
+ :picker-options="pickerOptions"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
/>
@@ -622,6 +637,7 @@
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
/>
</el-form-item>
<el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
@@ -640,12 +656,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鎺掔▼" prop="isAps">
- <el-radio-group v-model="dialogForm.isAps">
- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
- <el-radio key="N" label="N" value="N">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
+
</el-form>
<!-- 宸ヨ壓璺嚎鏀惧ぇ闀滃璇濇-->
@@ -1592,7 +1603,7 @@
import {
AddUpdateMesOrder,
ClosedMesOrder,
- DeleteMesOrder, ErpOrderSearch,
+ DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison,
MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep,
SelectRouteStep
} from '@/api/scgl'
@@ -1639,7 +1650,9 @@
// { code: 'CREATED', name: '宸插叧闂�' }
{ code: 'ALLO', name: '宸叉淳鍙�' },
{ code: 'START', name: '寮�宸�' },
- { code: 'CLOSED', name: '瀹屽伐' }
+ { code: 'CLOSED', name: '瀹屽伐' },
+ { code: 'NOSCHED', name: '寰呮帓绋�' },
+ { code: 'SCHED', name: '宸叉帓绋�' }
],
total: 10,
radioSelected: '',
@@ -1668,12 +1681,7 @@
bomId: '', // 鐗╂枡娓呭崟id
OperType: '' // 鎿嶄綔绫诲瀷
},
- bomIdArr: [// 鐗╂枡娓呭崟涓嬫媺 鍥犱负鎺ュ彛杩樻病鍐欙紝鏆傛椂鐢ㄥ啓姝荤殑鍊�
- { code: 15, name: 'V5' },
- { code: 14, name: 'V1' },
- { code: 17, name: 'V7' },
- { code: 16, name: 'V6' }
- ],
+ bomIdArr: [], // 鐗╂枡娓呭崟涓嬫媺
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
{ code: 'FO', name: '鎶ュ簾琛ュ崟' }
@@ -1833,7 +1841,12 @@
// { code: 3, name: '50*40' },
// { code: 4, name: '50*80' },
// { code: 5, name: '40*30' }
- ]
+ ],
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
+ }
}
},
created() {
@@ -1949,24 +1962,9 @@
this.dialogForm.planstartdate = handleDatetime(new Date())
this.dialogForm.planenddate = handleDatetime(new Date())
this.dialogForm.orderlev = 3
-
- this.dialogForm.bomId = this.getMaxBomId()
- },
- // 鏌ユ壘鐗╂枡娓呭崟閲岄潰鐗堟湰鏈�澶х殑鍊�
- getMaxBomId() {
- let max = 0// 鏈�澶у��
- let code = ''// 鏈�澶у�煎搴旂殑code
- this.bomIdArr.forEach(item => {
- if (parseFloat(item.name.substring(1)) > max) {
- max = parseFloat(item.name.substring(1))
- code = item.code
- }
- })
- return code
},
// 浜у搧淇℃伅鍊兼敼鍙�
async partcodeChange(val) {
- console.log(val, 22)
const { data: res } = await PartSelectRoute({ partcode: val })
this.routeArr = res
@@ -1994,6 +1992,18 @@
const { data: res2 } = await RouteSelectWkshop(data)
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
+ },
+ // 鏄惁鎺掔▼鍊兼敼鍙樻椂
+ changeIsAps(val) {
+ if (val === 'N') {
+ this.dialogForm.bomId = ''
+ }
+ if (val === 'Y') {
+ JobCreationSonAddVison({ partnumber: this.dialogForm.partcode }).then(res => {
+ this.bomIdArr = res.data
+ this.dialogForm.bomId = this.bomIdArr[0].id
+ })
+ }
},
// 宸ュ簭浠诲姟
async check(row) {
@@ -2038,8 +2048,6 @@
this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
this.dialogForm.planenddate = row.plan_enddate !== null ? row.plan_enddate : handleDatetime(new Date())
this.dialogForm.orderlev = row.piroque !== null ? row.piroque : 3 // 绛夌骇
-
- this.dialogForm.bomId = this.getMaxBomId() // 鏆傛椂鍐欐
})
},
// 鍒犻櫎鎸夐挳
@@ -2117,6 +2125,8 @@
// const { data: res } = await PartSelectRpute({ partcode: val })
// this.routeArr = res
// this.dialogForm.routecode = ''
+ this.dialogForm.isAps = 'N'
+ this.dialogForm.bomId = ''
this.partcodeChange(val)
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -2140,7 +2150,9 @@
this.dialogForm.planenddate = '' // 璁″垝瀹屾垚鏃堕棿
this.dialogForm.orderlev = '' // 宸ュ崟绛夌骇
this.dialogForm.isAps = 'N' // 鏄惁鎺掔▼
- this.dialogForm.bomId = this.getMaxBomId()
+ this.dialogForm.bomId = ''
+
+ this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -2173,7 +2185,7 @@
planenddate: this.dialogForm.planenddate, // 璁″垝瀹屾垚鏃堕棿
orderlev: this.dialogForm.orderlev, // 宸ュ崟绛夌骇
is_aps: this.dialogForm.isAps, // 鏄惁鎺掔▼
- bom_id: this.dialogForm.bomId, // 鏄惁鎺掔▼
+ bom_id: this.dialogForm.bomId, // 鐗╂枡娓呭崟id
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
this.$store.state.app.buttonIsDisabled = true
@@ -2275,9 +2287,9 @@
// div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
+ this.dialogVisibleApprove = true
}
})
- this.dialogVisibleApprove = true
},
dialogVisibleTaskClose() {
this.dialogForm.mesordercode = ''
@@ -2591,8 +2603,6 @@
},
// 琛岀偣鍑讳簨浠�
async rowClick(row, event, column) {
- console.log(row, event, column)
- console.log(row.wo_code, event, column)
this.radioSelected = row.wo_code
const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
this.tableDataDetail = res
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 18b0ff6..f7b7210 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -302,13 +302,13 @@
<el-dialog
:title="operation==='add'?'鏂板':'涓嬭揪'"
:visible.sync="dialogVisible"
- width="800px"
+ width="860px"
top="15vh"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="106px">
<!-- <el-form-item label="璁㈠崟鐘舵��" prop="erporderstus">-->
<!-- <el-select-->
<!-- v-model="dialogForm.erporderstus"-->
@@ -369,6 +369,19 @@
style="width: 200px"
/>
</el-form-item>
+ <el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
+ <el-date-picker
+ v-model="dialogForm.saleOrderDeliveryDate"
+ type="date"
+ size="mini"
+ :clearable="false"
+ class="dateMini"
+ :picker-options="pickerOptions"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ />
+ </el-form-item>
+
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -425,7 +438,7 @@
paystartdate: '', // 棰勮寮�宸ユ椂闂�
payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
- prop: 'createdate', // 鎺掑簭瀛楁
+ prop: 'wo', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -457,7 +470,8 @@
erpqty: '', // 璁㈠崟鏁伴噺
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
- relse_qty: '' // 宸蹭笅鍗曟暟閲�
+ relse_qty: '', // 宸蹭笅鍗曟暟閲�
+ saleOrderDeliveryDate: ''// 棰勮浜や粯鏃ユ湡
},
operation: '',
dialogFormRules: {
@@ -472,8 +486,16 @@
],
ordernum: [
{ required: true, message: '璇疯緭鍏ヤ笅鍗曞崟鏁�', trigger: ['blur', 'change'] }
+ ],
+ saleOrderDeliveryDate: [
+ { required: true, message: '璇烽�夋嫨棰勮浜や粯鏃ユ湡', trigger: ['blur', 'change'] }
]
+ },
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
}
// expireTimeOption: {
@@ -626,6 +648,10 @@
},
// 淇敼鎸夐挳
edit(operation, row) {
+ if (parseFloat(row.qty) === parseFloat(row.relse_qty)) {
+ return this.$message.info('姝ゅ伐鍗曞凡鍏ㄩ儴涓嬭揪锛�')
+ }
+
this.operation = operation
this.dialogVisible = true
@@ -640,6 +666,8 @@
this.dialogForm.wkshopname = row.wkshp_name
this.dialogForm.warehousecode = row.stck_code
this.dialogForm.warehousename = row.stck_name
+
+ this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate
this.dialogForm.erpqty = row.qty
this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
@@ -658,6 +686,8 @@
this.dialogForm.wkshopname = ''
this.dialogForm.warehousecode = ''
this.dialogForm.warehousename = ''
+
+ this.dialogForm.saleOrderDeliveryDate = ''
this.dialogForm.erpqty = ''
this.dialogForm.markqty = ''
@@ -697,8 +727,10 @@
'erpqty': this.dialogForm.erpqty,
'markqty': this.dialogForm.markqty,
'ordernum': this.dialogForm.ordernum,
- 'relse_qty': this.dialogForm.relse_qty
+ 'relse_qty': this.dialogForm.relse_qty,
+ 'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
}
+
MarkSaveErpOrder(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
@@ -850,6 +882,21 @@
}
}
+.dateMini {
+ ::v-deep .el-input__inner {
+ line-height: 34px;
+ height: 34px;
+ width: 200px;
+ display: flex;
+ font-size: 14px !important;
+ align-items: center !important;
+ }
+
+ ::v-deep .el-input__prefix {
+ margin-top: -3px;
+ }
+}
+
</style>
<style>
.el-table .custom-row {
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index 8a912f7..d2d20a7 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -40,14 +40,15 @@
ref="tableDataRef"
class="tableFixed"
:data="tableData"
- :height="(tableHeight-300)+'px'"
+ :height="(tableHeight-400)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:(tableHeight-300)+'px',}"
+ :style="{width: 100+'%',height:(tableHeight-400)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeTop"
+ @row-click="rowClick"
>
<el-table-column
width="50"
@@ -56,9 +57,9 @@
<template slot-scope="{row}">
<el-radio
v-model="radioSelectedId"
- :label="row.id"
- @change.native="getCurrentRowTop(row.id)"
+ :label="row.AdvaScheId"
/>
+ <!-- @change.native="getCurrentRowTop(row.id)"-->
</template>
</el-table-column>
<el-table-column
@@ -68,60 +69,95 @@
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="AdvaSchePiroQue"
label="浼樺厛绾�"
+ width="90"
sortable="custom"
/>
<el-table-column
- prop="org_name"
+ prop="AdvaScheWorkShop"
label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="description"
+ prop="AdvaScheWorkCode"
label="宸ュ崟缂栧彿"
+ min-width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="AdvaSchePartNumber"
label="浜у搧缂栫爜"
+ min-width="110"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.AdvaSchePartNumber">{{ row.AdvaSchePartNumber }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePartName"
+ min-width="160"
+ show-tooltip-when-overflow
label="浜у搧鍚嶇О"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePartSpec"
label="浜у搧瑙勬牸"
+ width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaSchePartSpec">{{ row.AdvaSchePartSpec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheQty"
label="鏁伴噺"
+ width="110"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheEndDate"
label="瑕佹眰浜や粯鏃堕棿"
sortable="custom"
+ width="160"
/>
<el-table-column
- prop="lm_user"
- label="浜や粯鐘舵��"
+ prop="AdvaScheStus"
+ label="鎺掔▼鐘舵��"
+ width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaScheStus==='NOSCHED'">寰呮帓绋�</div>
+ <div v-if="row.AdvaScheStus==='SCHED'">宸叉帓绋�</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheBotProcName"
label="鎺掔▼宸ュ簭"
+ width="110"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePCStartDate"
label="璁″垝鎺掔▼鏃堕棿"
+ width="160"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaSchePCStartDate">{{ row.AdvaSchePCStartDate }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
</el-table>
</div>
@@ -272,9 +308,10 @@
<script>
import Pagination from '@/components/Pagination'
-import { OrganizationSearch } from '@/api/jcsz'
import Test from '@/components/Test'
import dayjs from 'dayjs'
+import { AdvancedSchedulingSearch, OnclickAdvancedSchedulingDevice } from '@/api/scgl'
+import { handleDatetime } from '@/utils/global'
const scaleList = `30,60,240,360`.split(',').map(n => parseInt(n))
const timeList = `0,30,60,120,240,480`.split(',').map(n => parseInt(n))
@@ -296,7 +333,7 @@
wocode: '', // 鐢熶骇宸ュ崟鍙�
partcode: '', // 鐗╂枡缂栫爜
partname: '', // 鐗╂枡鍚嶇О
- prop: 'lm_date', // 鎺掑簭瀛楁
+ prop: 'AdvaScheWorkCode', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -346,7 +383,7 @@
radio: '',
formBottom: {
- value1: ['2022-11-07', '2022-11-12'], // 鎺掔▼鏃ユ湡
+ value1: ['2022-11-24', '2022-11-30'], // 鎺掔▼鏃ユ湡
types: 'N', // 鎺掔▼鏂瑰紡
scale: 60, // 鏃堕棿鍒诲害
times: 0, // 鎹㈠瀷鏃堕棿
@@ -437,7 +474,7 @@
},
'rows': [
{
- 'YearDate': '2022-11-07',
+ 'YearDate': '2022-11-24',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -453,7 +490,7 @@
]
},
{
- 'YearDate': '2022-11-08',
+ 'YearDate': '2022-11-25',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -469,7 +506,7 @@
]
},
{
- 'YearDate': '2022-11-09',
+ 'YearDate': '2022-11-26',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -485,7 +522,7 @@
]
},
{
- 'YearDate': '2022-11-10',
+ 'YearDate': '2022-11-27',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -501,7 +538,7 @@
]
},
{
- 'YearDate': '2022-11-11',
+ 'YearDate': '2022-11-28',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -517,7 +554,7 @@
]
},
{
- 'YearDate': '2022-11-12',
+ 'YearDate': '2022-11-29',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -549,7 +586,7 @@
created() {
this.getAdvancedSchedulingSearch()
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
// this.AdvancedSchedulingWorkShop()
this.OnclickAdvancedSchedulingDevice()
},
@@ -562,7 +599,7 @@
},
methods: {
async getAdvancedSchedulingSearch() {
- const res = await OrganizationSearch(this.formTop)
+ const res = await AdvancedSchedulingSearch(this.formTop)
this.tableData = res.data
this.totalTop = res.count
},
@@ -606,6 +643,24 @@
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
+ // 琛岀偣鍑讳簨浠�
+ async rowClick(row, event, column) {
+ this.radioSelectedId = row.AdvaScheId
+
+ const data = {
+ wocode: row.AdvaScheWorkCode,
+ wkshpcode: row.AdvaScheWorkShopid,
+ partcode: row.AdvaSchePartNumber,
+ botproccode: row.AdvaScheBotProcid,
+ startdate: handleDatetime(new Date()),
+ enddate: row.AdvaScheEndDate
+ }
+
+ const res = await OnclickAdvancedSchedulingDevice(data)
+ console.log(res)
+ this.testValue = res
+ },
+
/*
鎺掔▼閮ㄥ垎鐨勬柟娉�
*/
@@ -618,7 +673,7 @@
this.form.page = 1
this.show = false
this.radio = ''
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
},
resetFormcx() {
this.$nextTick(() => {
@@ -634,11 +689,11 @@
this.radio = '';
(this.form.prop = column.prop), (this.form.order = column.order)
this.show = false
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
},
SeachKey() {
this.form.page = 1
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
this.show = false
this.radio = ''
},
@@ -739,17 +794,17 @@
this.form.rows = val
this.show = false
this.radio = ''
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
},
pageChange(val) {
this.form.page = val
this.show = false
this.radio = ''
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
},
// 鏌ヨ
- AdvancedSchedulingSearch() {
- // automaticScheduling.AdvancedSchedulingSearch(this.form).then(res => {
+ getAdvancedSchedulingSearch2() {
+ // automaticScheduling.AdvancedSchedulingSearch2(this.form).then(res => {
// this.mn_data = res.rows
// this.total = res.total
// this.oneClick()
@@ -1155,7 +1210,7 @@
this.formBottom.meter = 0
this.formBottom.real_num = 0
this.OnclickAdvancedSchedulingDevice()
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
})
}
},
@@ -1873,7 +1928,7 @@
/*background-color: #f8f8fa;*/
background-color: #fff;
margin-top: 20px;
- /*height: 390px;*/
+ height: 490px;
}
label {
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index cf72335..46d2c80 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -545,6 +545,7 @@
editStepName: '', // 缂栬緫鏃跺姞宸ュ伐搴忓悕绉�
operation: '',
dialogFormRules: {},
+ radioChangeTempValue: '',
title_value: '鏁版嵁瀵煎叆 / 鑺傛媿宸ヤ环',
code: '24',
@@ -645,10 +646,12 @@
const { data: res } = await RouteSelectStep({ routecode: val })
this.stepDialogArr = res
this.eqpDialogArr = []
+ this.radioChangeTempValue = ''
},
radioChange(val) {
this.isEqpTableEdit = true
+ this.radioChangeTempValue = val
// this.dialogForm.stepcode = this.stepDialogArr.find(item => item.name === val).code
this.getEqpTable(val)
},
@@ -705,7 +708,7 @@
if (res.code === '200') {
this.isEqpTableEdit = true
this.$message.success('淇濆瓨鎴愬姛锛�')
- await this.getEqpTable()
+ this.radioChange(this.radioChangeTempValue)
}
},
// 鍙栨秷琛�
@@ -764,7 +767,7 @@
const res = await SaveBeatRate(newData)
if (res.code === '200') {
this.$message.success('澶嶅埗鎴愬姛锛�')
- await this.getEqpTable()
+ this.radioChange(this.radioChangeTempValue)
this.isEqpTableEdit = true
}
},
diff --git a/src/views/zzmx/wlqd.vue b/src/views/zzmx/wlqd.vue
index edd3abf..3da1dfe 100644
--- a/src/views/zzmx/wlqd.vue
+++ b/src/views/zzmx/wlqd.vue
@@ -269,6 +269,7 @@
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
:disabled="operation!=='add'"
+ filterable
@change="partSelectChange"
>
<el-option
@@ -284,6 +285,7 @@
v-model="dialogForm.parentpartname"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ filterable
:disabled="operation!=='add'"
:popper-append-to-body="false"
@change="partSelectChange"
@@ -312,24 +314,10 @@
<!-- />-->
<!-- </el-select>-->
</el-form-item>
- <el-form-item label="璁￠噺鍗曚綅" prop="uomcode">
- <el-select
- v-model="dialogForm.uomcode"
- disabled
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- :popper-append-to-body="false"
- >
- <el-option
- v-for="item in openTypeArr"
- :key="item.partcode"
- :label="item.uom_code"
- :value="item.partcode"
- />
- </el-select>
- <!-- <el-input v-model="dialogForm.uomcode" readonly style="width: 200px" />-->
+ <el-form-item label="璁￠噺鍗曚綅">
+ <el-input v-model="dialogForm.uomname" disabled style="width: 200px" />
</el-form-item>
- <!-- <el-form-item label="瀛樿揣绫诲瀷" prop="uomcode">-->
+ <!-- <el-form-item label="瀛樿揣绫诲瀷">-->
<!-- <el-input v-model="dialogForm.chlx" readonly style="width: 200px" />-->
<!-- </el-form-item>-->
<el-form-item label="鍩虹鏁伴噺" prop="quantity">
@@ -344,6 +332,7 @@
<el-select
v-model="dialogForm.status"
style="width: 200px"
+ filterable
placeholder="璇烽�夋嫨"
:disabled="operation==='preview'"
:popper-append-to-body="false"
@@ -412,6 +401,7 @@
<el-select
v-if="row.isVisible===1"
v-model="row.SMATERIRL_CODE"
+ filterable
placeholder="璇烽�夋嫨"
@change="val=>tableChange(val,row)"
>
@@ -428,7 +418,7 @@
<el-table-column
prop="SMATERIRL_NAME"
label="瀛愪欢鍚嶇О"
-
+ filterable
show-tooltip-when-overflow
>
@@ -456,7 +446,7 @@
show-tooltip-when-overflow
/>
<el-table-column
- prop="uomcode"
+ prop="uomname"
label="璁￠噺鍗曚綅"
width="110"
/>
@@ -618,6 +608,7 @@
parentpartname: '',
parentpartspec: '',
uomcode: '',
+ uomname: '',
// chlx: '',
quantity: '',
status: '',
@@ -641,9 +632,6 @@
quantity: [
{ required: true, message: '璇疯緭鍏ュ熀纭�鏁伴噺', trigger: ['blur', 'change'] }
],
- // uomcode: [
- // { required: true, message: '璇疯緭鍏ヨ閲忓崟浣�', trigger: ['blur', 'change'] }
- // ],
// version: [
// { required: true, message: '璇疯緭鍏ョ増鏈彿', trigger: ['blur', 'change'] }
// ],
@@ -731,7 +719,8 @@
this.dialogForm.parentpartcode = res.partcode
this.dialogForm.parentpartname = res.partname
this.dialogForm.parentpartspec = res.partspec
- this.dialogForm.uomcode = res.uom_code
+ // this.dialogForm.uomcode = res.uom_code
+ this.dialogForm.uomname = res.uom_name
if (this.PartSelectArrTemp.length > 0) {
this.PartSelectArr.unshift(this.PartSelectArrTemp[0])
@@ -795,7 +784,6 @@
this.getPartSelect()
this.dialogForm.startdate = handleDatetime(new Date())
- console.log(this.dialogForm.startdate, 7)
},
// 淇敼鎸夐挳
async edit(operation, row) {
@@ -821,7 +809,8 @@
SMATERIRL_CODE: item.partcode,
SMATERIRL_NAME: item.partname,
SMATERIRL_SPEC: item.partspec,
- uomcode: item.uom_name,
+ uomcode: item.uom_code,
+ uomname: item.uom_name,
BASE_QUANTITY: item.base_quantity,
LOSS_QUANTITY: item.loss_quantity,
TOTAL_QUANTITY: item.total_quantity,
@@ -836,6 +825,7 @@
this.dialogForm.parentpartname = row.partname
this.dialogForm.parentpartspec = row.partspec
this.dialogForm.uomcode = row.uom_code
+ this.dialogForm.uomname = row.uom_name
this.dialogForm.startdate = row.startdate
this.dialogForm.status = row.status
this.dialogForm.quantity = row.quantity
@@ -859,6 +849,7 @@
row.SMATERIRL_NAME = res.partname
row.SMATERIRL_SPEC = res.partspec
row.uomcode = res.uom_code
+ row.uomname = res.uom_name
// this.PartSelectArr.forEach((item, index) => {
// this.PartSelectArr.splice(index, 1)
@@ -885,6 +876,7 @@
SMATERIRL_NAME: '',
SMATERIRL_SPEC: '',
uomcode: '',
+ uomname: '',
BASE_QUANTITY: '',
LOSS_QUANTITY: '',
TOTAL_QUANTITY: '',
@@ -961,6 +953,7 @@
this.dialogForm.parentpartname = ''
this.dialogForm.parentpartspec = ''
this.dialogForm.uomcode = ''
+ this.dialogForm.uomname = ''
// this.dialogForm.chlx = ''
this.dialogForm.quantity = ''
this.dialogForm.status = ''
@@ -989,7 +982,7 @@
parentpartcode: this.dialogForm.parentpartcode,
parentpartname: this.dialogForm.parentpartname,
parentpartspec: this.dialogForm.parentpartspec,
- uomcode: this.dialogForm.uomcode,
+ uomcode: this.PartSelectArrTemp.length > 0 ? this.PartSelectArrTemp[0].uom_code : this.dialogForm.uomcode,
quantity: this.dialogForm.quantity,
status: this.dialogForm.status,
startdate: this.dialogForm.startdate,
@@ -997,6 +990,7 @@
worklist: this.dialogTableDataArr,
opertype: this.operation === 'add' ? 'Add' : 'Update'
}
+ // console.log(data)
this.$store.state.app.buttonIsDisabled = true
AddUpdateBoIventory(data).then(res => {
--
Gitblit v1.9.3