|
|
@@ -119,7 +119,7 @@
|
|
|
:row-style="{ height: '20px' }"
|
|
|
:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
:header-cell-style="{ padding: '0px' }"
|
|
|
- @row-dblclick="yjupdateCompanyFunc"
|
|
|
+ @row-click="yjupdateCompanyFunc"
|
|
|
style="width: 100%;height: 330px" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
<!-- <el-table-column type="selection" width="55" />-->
|
|
|
<el-table-column align="left" label="选择" prop="yj_yjno" width="80"/>
|
|
|
@@ -1706,6 +1706,7 @@ const FacilityProduction = async () => {
|
|
|
formData.value.工序号 = response.data.工序名称.substring(0,2);
|
|
|
formData.value.工序名称 = response.data.工序名称;
|
|
|
formData.value.产品名称 = response.data.产品名称;
|
|
|
+ formData.value.班组Id=response.data.班组Id
|
|
|
formData.value.machine=JTMC
|
|
|
formData.value.状态=response.data.状态
|
|
|
BZMC.value=response.data.班组编号
|
|
|
@@ -2033,14 +2034,22 @@ const RemodelGetTab = async() => {
|
|
|
const response = await remodelGetTab()
|
|
|
let arr=[]
|
|
|
if (response.code === 0) {
|
|
|
- Object.keys(response.data).map(item=>{
|
|
|
- arr.push(response.data)
|
|
|
- })
|
|
|
- console.log(arr)
|
|
|
- huanxingtreeData.value=response.data.map((item)=>({
|
|
|
- label:item
|
|
|
- }))
|
|
|
- console.log(huanxingtreeData)
|
|
|
+ for(let key in response.data){
|
|
|
+ if(response.data[key][0]){
|
|
|
+ let children =[]
|
|
|
+ for (let i = 0; i < response.data[key].length; i++) {
|
|
|
+ children.push({label:response.data[key][i]})
|
|
|
+ }
|
|
|
+ arr.push({
|
|
|
+ label:key,
|
|
|
+ children:children
|
|
|
+ })
|
|
|
+ console.log(response.data[key].length)
|
|
|
+ }else{
|
|
|
+ arr.push({label:key})
|
|
|
+ }
|
|
|
+ }
|
|
|
+ huanxingtreeData.value=arr
|
|
|
}
|
|
|
}
|
|
|
//设置机台状态
|
|
|
@@ -2978,6 +2987,27 @@ const updateCompanyFunc = async(row) => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+const yjupdateCompanyFunc = async(row) => {
|
|
|
+ console.log(row)
|
|
|
+ const res = await setMachineTeam({
|
|
|
+ machine: JTMC.split("#")[0],
|
|
|
+ order:row['工单编号|质量信息'].split('|')[0],
|
|
|
+ yjno:row['工序名称'].split('-')[0],
|
|
|
+ gy_name:row['工序名称'],
|
|
|
+ sczl_bzdh:BZMC.value,
|
|
|
+ status:formData.value.状态,
|
|
|
+ production_now:0,
|
|
|
+ production_all:0,
|
|
|
+ team_id:formData.value.班组Id
|
|
|
+ })
|
|
|
+ if (res.code === 0) {
|
|
|
+ FacilityProduction()
|
|
|
+ ElMessage({
|
|
|
+ type: 'success',
|
|
|
+ message: '成功'
|
|
|
+ })
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
// 删除行
|
|
|
const deleteCompanyFunc = async (row) => {
|