Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

ZengTao

2025-05-26 fcb8b8cc392b146aa11bbaab9e497f7f13f29d44

 UI-Project/src/views/hollow/hollowequipmenttwo.vue

@@ -73,13 +73,16 @@
    ref="table"
    style="margin-top: 20px; height: 700px;"
    :data="tableDatab"
    :row-class-name="tableRowClassName"
    :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
    row-key="projectNumber"
  >
    <!-- <el-table-column type="expand"> -->
    <el-table-column>
    <template #default="props">
      <el-table :data="props.row.records" style="width: 100%">
      <el-table :data="props.row.flowCardGlassInfoDTOList" style="width: 100%"
      :row-class-name="(row) => nestedTableRowClassName(props.row, row)" 
      >
      <el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
      <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80"/>
      <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
@@ -90,10 +93,12 @@
      </el-table>
      </template>
    </el-table-column>
    <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
    <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
    <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
    <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
    <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
        <template #default="scope">
          <el-button type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
          <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
          <el-button type="text" plain @click="handleBindRack(scope.row)">{{
              $t('hellow.missingfilms')
            }}
@@ -109,21 +114,21 @@
<!-- 中空配方添加 -->
<el-dialog v-model="add" top="23vh" width="55%" :title="$t('hellow.hollowformula')" >
    <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
     <el-form  label-width="150px">
      <el-form label-width="150px" label-position="right">
     <el-form  label-width="200px">
      <el-form label-width="200px" label-position="right">
        <el-row style="margin-top: 10px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
            <el-select v-model="filmRemove" clearable  style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
            <el-select v-model="filmRemove" clearable  style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
        <el-option :label="$t('Mounting.removal')" value="1"></el-option>
        <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
      </el-select>
@@ -132,35 +137,35 @@
              </div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
        <el-row style="margin-top: 30px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
           </el-form-item>
            </div></div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
        <el-row style="margin-top: 30px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
            <el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
              </el-form-item>
            </div></div>
@@ -181,21 +186,21 @@
<!-- 中空配方修改 -->
<el-dialog v-model="adda" top="23vh" width="55%" :title="$t('hellow.edithollowformula')" >
    <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
     <el-form  label-width="150px">
      <el-form label-width="150px" label-position="right">
     <el-form  label-width="200px">
      <el-form label-width="200px" label-position="right">
        <el-row style="margin-top: 10px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
            <el-select v-model="filmRemove" clearable  style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
            <el-select v-model="filmRemove" clearable  style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
        <el-option :label="$t('Mounting.removal')" value="1"></el-option>
        <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
      </el-select>
@@ -204,35 +209,35 @@
              </div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
        <el-row style="margin-top: 30px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
           </el-form-item>
            </div></div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
        <el-row style="margin-top: 30px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
            <el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
              </el-form-item>
            </div></div>
@@ -356,7 +361,7 @@
  <el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
    <div style="margin-top: -20px;text-align: center;margin-left: 400px;">
      <el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
        {{ currentRow.projectNumber }}
        {{ currentRow.flowCardId }}
      </el-form-item>
    </div>
    <el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -478,7 +483,7 @@
    </template>
</el-dialog>
 <!-- 历史任务 -->
 <el-dialog v-model="blindb" top="5vh" width="71%">
 <el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
     <iframe 
     :src="iframeUrl" 
     marginwidth="2000px"
@@ -563,7 +568,7 @@
};
const handlePageChange2 = (newPage) => {
  currentPage2.value = newPage;
  fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
  fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
  try {
@@ -662,20 +667,20 @@
// 缺片详情
const handleBindRack = (row) => {
  currentPage2.value = 1;
  const { projectNumber, layer } = row;
  currentRow.projectNumber  = row.projectNumber;
  const { flowCardId } = row;
  currentRow.flowCardId  = row.flowCardId;
  dialogFormVisibleb.value = true;
  fetchFlowBind(projectNumber, layer,currentPage2.value);
  fetchFlowBind(flowCardId,currentPage2.value);
};
// 领取任务
const handletake = (row) => {
  window.localStorage.setItem('flowCardId', row.projectNumber)
  window.localStorage.setItem('flowCardId', row.flowCardId)
  dialogFormVisiblec.value = true;
  fetchmulan()
};
// 强制出片
const handleout = (row) => {
  window.localStorage.setItem('flowCardId', row.projectNumber)
  window.localStorage.setItem('flowCardId', row.flowCardId)
  dialogFormVisibled.value = true;
  fetchmulan()
};
@@ -683,14 +688,14 @@
const fetchFlowCardId = async () => {
  try {
    const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
      deviceId: 0,
      filmsId: '',
      flowCardId: '',
      thickness: '',
      thickness: 0,
    });
    if (response.code == 200) {
      ElMessage.success(response.message);
      const newData = parseData(response.data);
      tableDatab.value = newData;
      tableDatab.value = response.data;
    } else {
      ElMessage.error('Failed to fetch data');
    }
@@ -698,6 +703,18 @@
    ElMessage.error('Error fetching data');
  }
};
function tableRowClassName({ row }) {
  if (row.isThroughSlot == true) {
    return 'row-red-background';
  }
  return '';
}
function nestedTableRowClassName(parentRow, row) {
  if (parentRow.isThroughSlot == true) {
    return 'row-red-background';
  }
  return '';
}
const fetchFlowCardsearch = async () => {
  try {
    const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
@@ -707,8 +724,7 @@
    });
    if (response.code == 200) {
      ElMessage.success(response.message);
      const newData = parseData(response.data);
      tableDatab.value = newData;
      tableDatab.value = response.data;
    } else {
      ElMessage.error('Failed to fetch data');
    }
@@ -859,14 +875,20 @@
  }
};
const parseData = (rawData) => {
  return Object.keys(rawData).map(projectNumber => ({
    projectNumber,
    records: rawData[projectNumber]
  }));
  return Object.entries(rawData).map(([compositeKey, records]) => {
    const [projectNumber, productName] = compositeKey.split(':');
    return {
      projectNumber,
      productname: productName,
      records: records.map(record => ({
        ...record,
      }))
    };
  });
};
const fetchFlowBind = async (flowCardId, layer, page) => {
const fetchFlowBind = async (flowCardId, page) => {
  try {
    var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
    var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
    const response = await request.post(url)
    if (response.code == 200) {
      tableDatac.value = response.data[page];
@@ -986,11 +1008,11 @@
});
</script>
<style scoped>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dt { display:block; float:left;line-height: 20px;margin-left: 10px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 70%;}
#dialog-footer {
  text-align: center;
  margin-top: -15px;
  margin-top: -5px;
}
#dotClass {
  display: flex;
@@ -999,4 +1021,7 @@
  margin-top: 20px;
  margin-bottom: 10px;
}
::v-deep(.row-red-background) {
  background-color: rgb(224.6, 242.8, 215.6) !important;
}
</style>