Merge remote-tracking branch 'origin/master'

ZengTao

5 天以前 b8a043314eb644f45e3e110c75c29b19218c2ae8

 UI-Project/src/views/Returns/upreturns2.vue

@@ -182,15 +182,11 @@
    ElMessage.error(t('basicData.plselectproject'))
    return
  }
   if (!filmRemove.value) {
    ElMessage.error(t('Mounting.removalmethod'))
    return
  }
  try {
    const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
      stationCell: 6,
      engineerId: selectedProjectNo.value,
      filmRemove: parseInt(filmRemove.value, 10),
      filmRemove: 0,
    })
    window.localStorage.setItem('engineeringIda', selectedProjectNo.value)
    window.localStorage.setItem('filmRemove', filmRemove.value)
@@ -615,7 +611,7 @@
    </template>
  </el-dialog>
        </div>
  <el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
  <el-dialog v-model="dialogFormVisible" top="24vh" width="50%">
    <div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
      <el-form-item :label="$t('Mounting.loadingline')" :required="true">
        <el-select disabled v-model="stationCell" clearable :placeholder="$t('Mounting.inloadingline')">
@@ -640,14 +636,12 @@
          />
        </el-select>
      </el-form-item>
      <el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
      <!-- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
        <el-select v-model="filmRemove" clearable :placeholder="$t('Mounting.removalmethod')">
          <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
            <!-- 不除膜：0   除膜：2 -->
          <!-- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option> -->
          <el-option :label="$t('Mounting.removal')" value="2"></el-option>
        </el-select>
      </el-form-item>
      </el-form-item> -->
    </div>
    <template #footer>
      <div id="dialog-footer">