Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-heli into dev

mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue

@@ -87,7 +87,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发货方式" prop="deliverMode">
-              <el-select :disabled="detailDisabled" v-model="formData.deliverMode" placeholder="请选择发货方式" class="!w-250px">
+              <el-select clearable :disabled="detailDisabled" v-model="formData.deliverMode" placeholder="请选择发货方式" class="!w-250px">
                 <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DELIVER_MODE)" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue

@@ -670,8 +670,6 @@ const handleInitPlanSub = async (id) => {
       item.threeDimOwner = subTemp.threeDimOwner
     }
   })
-  console.log(planData.value, 'planData')
-  console.log(formData.value, 'formData')
 }
 /** 重置表单 */
 const resetForm = () => {

mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue

@@ -321,9 +321,7 @@
                     <template #header> <span class="hl-table_header">*</span>材质 </template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.compositionId`" :rules="subFormRules.compositionId" class="mb-0px!">
-                        <el-select v-model="row.compositionId" placeholder="请输入材质" :remote-method="remoteCompositionSearch" remote-show-suffix remote clearable reserve-keyword filterable :loading="compositionSelectLoading" :disabled="detailDisabled" :class="{ 'alter-class': fieldHasAlterInRow('compositionId', row) }">
-                          <el-option v-for="item in compositionSelectList" :key="item.id" :label="item.name" :value="item.id" />
-                        </el-select>
+                        <CompositionSelect v-model="row.compositionId" :disabled="detailDisabled" :class="{ 'alter-class': fieldHasAlterInRow('compositionId', row) }"/>
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -462,6 +460,7 @@ import download from '@/utils/download'
 import { useUserStore } from '@/store/modules/user'
 import { getUserProfile } from '@/api/system/user/profile'
 import { getOperateLogPage } from '@/api/system/operatelog'
+import CompositionSelect from "@/views/heli/hlvuestyle/compositionSelect.vue";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -590,24 +589,6 @@ const remoteCustomerSearch = (query: string) => {
   }
 }
 
-const compositionList = ref<CompositionApi.CompositionVO[]>([])
-const compositionSelectList = ref<CompositionApi.CompositionVO[]>([])
-const compositionSelectLoading = ref(false)
-
-const remoteCompositionSearch = (query: string) => {
-  if (query) {
-    compositionSelectLoading.value = true
-    setTimeout(() => {
-      compositionSelectLoading.value = false
-      compositionSelectList.value = compositionList.value.filter((item) => {
-        return item.name.toLowerCase().includes(query.toLowerCase())
-      })
-    }, 200)
-  } else {
-    compositionSelectList.value = compositionList.value
-  }
-}
-
 /** 子表的表单 */
 const projectOrderSubFormRef = ref()
 

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -289,7 +289,6 @@ import * as PnApi from '@/api/heli/pn'
 import { deleteFile, downloadFile, getFilePage } from '@/api/infra/file'
 import download from '@/utils/download'
 import * as UserApi from '@/api/system/user'
-import { log } from 'console'
 
 const reload = inject('reload')
 
@@ -409,7 +408,6 @@ const UpError = (err, file, fileList) => {
   if (err) {
     // 将失败的附件添加到failedAttachments.value数组中
     failedAttachments.value.push(file)
-    // console.log(failedAttachments.value);
     failedAttachmentsName.value = failedAttachments.value.map((value) => value.name)
   }
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue

@@ -426,7 +426,6 @@ const UpError = (err, file, fileList) => {
   if (err) {
     // 将失败的附件添加到failedAttachments.value数组中
     failedAttachments.value.push(file)
-    // console.log(failedAttachments.value);
     failedAttachmentsName.value = failedAttachments.value.map((value) => value.name)
   }
 }