From 1b63cf22b4f488bb78135bd25669105cc64d4712 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 19 十二月 2024 17:01:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
index 0da5087..6951b52 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
@@ -11,7 +11,8 @@
 
 let basic = ref({
   basicType : ['',''],
-  input:''
+  input:'',
+  nickname:''
 })
 let options=ref([
   { "label": t('orderBasicData.order'),
@@ -128,11 +129,18 @@
     basic.value.basicType[0] =  props.rowIndex.basicType
     basic.value.basicType[1] =  props.rowIndex.basicCategory
     basic.value.input =  props.rowIndex.basicName
+    basic.value.nickname =  props.rowIndex.nickname
   }
 })
 
 const emit =  defineEmits(['gaveParent'])
 const saveBasicData =  () =>{
+  if(basic.value.basicType[1]==="hollowThickness"||basic.value.basicType[1]==="stuffThickness"||basic.value.basicType[1]==="InterlayerThickness"){
+    if(!basic.value.input.includes("mm")){
+      basic.value.input=basic.value.input+"mm"
+    }
+  }
+  basic.value.input=basic.value.input.trim()
   request.post(`/basicData/addBasicData`, basic.value).then(res => {
     if (res.data) {
       ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -141,10 +149,16 @@
   })
 }
 const updateBasicData =  () =>{
+  if(basic.value.basicType[1]==="hollowThickness"||basic.value.basicType[1]==="stuffThickness"||basic.value.basicType[1]==="InterlayerThickness"){
+    if(!basic.value.input.includes("mm")){
+      basic.value.input=basic.value.input+"mm"
+    }
+  }
   let submitArr  = props.rowIndex
   submitArr.basicType = basic.value.basicType[0]
   submitArr.basicCategory = basic.value.basicType[1]
-  submitArr.basicName = basic.value.input
+  submitArr.basicName = basic.value.input.trim()
+  submitArr.nickname = basic.value.nickname
   request.post(`/basicData/updateBasicData`, submitArr).then(res => {
     if (res.data) {
       ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -159,20 +173,42 @@
   ).map((item) =>item.children.filter((item) =>item.value === value[1]))
 }
 
+const changeFile = (file) => {
+  const isJPG = file.raw.type === 'image/jpeg' || file.raw.type === 'image/png' ;
+  const isLt2M = file.size / 1024 / 1024 < 5;
+
+  if (!isJPG) {
+    ElMessage.warning(t('orderBasicData.msg2'))
+    return
+  }
+  if (!isLt2M) {
+    ElMessage.warning(t('orderBasicData.msg1'))
+    return
+  }
+
+  return new Promise((resolve, reject) => {
+    let reader = new FileReader();
+    reader.readAsDataURL(file.raw);
+    reader.onload = (e) => {
+      resolve(e.target.result);
+      basic.value.nickname=e.target.result;
+    };
+  });
+}
+
 
 </script>
 
 <template>
   <div>
     <el-row>
-      <el-col :span="4">{{ $t('orderBasicData.basicType') }}:</el-col>
+      <el-col :span="4">{{ $t('orderBasicData.page.searchOrderBasicData') }}:</el-col>
       <el-col :span="12">
         <el-cascader
             v-model="basic.basicType"
             @change="handleChange"
             :options="options"
-            clearable
-            placeholder=""
+            :placeholder="$t('processCard.pleaseSelect')"
             :disabled="props.rowIndex"
         />
       </el-col>
@@ -184,6 +220,33 @@
       </el-col>
     </el-row>
     <el-row>
+      <el-col :span="4">{{ $t('orderBasicData.alias') }}:</el-col>
+      <el-col :span="12">
+        <el-input v-if="basic.basicType.length>0 && basic.basicType[1]!=='process'" v-model="basic.nickname"/>
+        <el-select v-model="basic.nickname" v-else>
+          <el-option  :label="$t('orderBasicData.commonProcess')" value="" />
+          <el-option  :label="$t('orderBasicData.laminatingProcess')" value="laminating" />
+        </el-select>
+      </el-col>
+    </el-row>
+    <el-row v-if="basic.basicType.length!==0 && basic.basicType[1]==='icon'" >
+      <el-col :span="4"></el-col>
+      <el-col :span="12">
+        <el-upload
+            v-model="basic.nickname"
+            :limit="1"
+            :on-change="changeFile"
+            class="upload-demo"
+            ref="upload"
+            action="https://jsonplaceholder.typicode.com/posts/"
+            :file-list="fileList"
+            :auto-upload="false">
+          <el-button slot="trigger" size="small" type="primary" >{{ $t('orderBasicData.selectFile') }}</el-button>
+          <div slot="tip" class="el-upload__tip">{{ $t('orderBasicData.msg3') }}</div>
+        </el-upload>
+      </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="4"></el-col>
       <el-col :span="12">
         <el-button v-show="!props.rowIndex" @click="saveBasicData" type="primary">{{ $t('basicData.insert') }}</el-button>

--
Gitblit v1.8.0