Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-10-23 fea188972674c312025095710d10658ed91329b6

 north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue

@@ -10,11 +10,13 @@
import GlassType from "@/components/sd/product/GlassType.vue"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {useI18n} from "vue-i18n";
import useUserInfoStore from "@/stores/userInfo";

const { t } = useI18n()
const router = useRouter()
const route = useRoute()
const value = ref('')
const userStore = useUserInfoStore()
const options = [
  {
    value: t('ingredients.originalFilm'),
@@ -107,13 +109,17 @@
      type:value.value,
      json:productName,
      width:BasicData.value[0].Type,
      height:BasicData.value[1].Type
      height:BasicData.value[1].Type,
       userName:userStore.user.userName,
       userId:userStore.user.userId
    }
  }else if(value.value===t('ingredients.accessories')){
     materialStore={
      id:ruleForm.value.id,
      type:value.value,
      json:productName,
       userName:userStore.user.userName,
       userId:userStore.user.userId
    }
  }