From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue | 283 ++++++++++++++++++++++++++++----------------------------
1 files changed, 140 insertions(+), 143 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
index 2b8e08e..3fedbf0 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
@@ -1,7 +1,18 @@
-<!-- 鐗╂枡璧勬枡鏂板鍘熺墖 -->
+
<script lang="ts" setup>
-import {ref} from "vue";
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import {ElMessage} from "element-plus"
+import {computed, onMounted, ref} from "vue"
+import {useRoute, useRouter} from "vue-router"
+import useUserInfo from "@/stores/userInfo"
+import GlassType from "@/components/sd/product/GlassType.vue"
+import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
+
+
+const router = useRouter()
+const route = useRoute()
const value = ref('')
const options = [
{
@@ -13,6 +24,125 @@
label: '杈呮枡',
}
]
+
+let BasicData = ref([])
+
+let ruleForm = ref({
+ id:0,
+ type: '',
+ json: ''
+
+})
+
+const userinfo=[]
+
+
+
+
+
+const getWork = () => {
+ //椤甸潰鍔犺浇璇锋眰
+ request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
+ if(res.code==200){
+ BasicData.value = res.data
+ for (let i=0;i<BasicData.value.length;i++){
+ BasicData.value[i].Type=userinfo[i]
+ }
+
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+const resetForm = () => {
+ BasicData.value.forEach((item)=>{
+ item.Type=""
+ })
+}
+
+const submitForm = () => {
+ let filterData = {}
+ let isBool=true
+ let index = 0
+ let productName = "{"
+
+ BasicData.value.forEach((item)=>{
+ filterData[item.OperateType]=item.Type
+ const customerName = item.Type
+ if(customerName === null || customerName === undefined || customerName === ''){
+ ElMessage.error('璇疯緭鍏�'+item.OperateTypeName)
+ isBool=false
+ return
+ }
+ if(index == BasicData.value.length - 1){
+ productName+='"'+item.OperateType+'":"'+item.Type+'"'
+ }else {
+ productName+='"'+item.OperateType+'":"'+item.Type+'",'
+ }
+ index++;
+ })
+ productName+="}"
+
+ let materialStore
+
+ if(value.value==='鍘熺墖'){
+ materialStore={
+ id:ruleForm.value.id,
+ type:value.value,
+ json:productName,
+ width:BasicData.value[0].Type,
+ height:BasicData.value[1].Type
+ }
+ }else if(value.value==='杈呮枡'){
+ materialStore={
+ id:ruleForm.value.id,
+ type:value.value,
+ json:productName,
+ }
+ }
+
+
+ console.log(materialStore)
+ if(isBool){
+ request.post("/MaterialStore/saveMaterialStore", materialStore).then((res) => {
+ if(res.code==200){
+ resetForm()
+ ElMessage.success('淇濆瓨鎴愬姛')
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+ }
+
+}
+
+
+
+
+ //鑾峰彇浼犺繃鏉ョ殑鏁版嵁杩涜鍒ゆ柇
+ const str = route.query.id
+ if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
+ ruleForm.value.id = Number(str)
+
+ request.post(`/MaterialStore/getSelectMaterialStore/1/100`,ruleForm.value).then((res) => {
+ if(res.code==200){
+ ruleForm.value=deepClone(res.data.data[0])
+ value.value=ruleForm.value.type
+ const cc= JSON.parse(ruleForm.value.json);
+ for (let i in cc){
+ userinfo.push(cc[i])
+ }
+ getWork()
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+ }
+
+
+
</script>
<template>
@@ -22,7 +152,7 @@
<div>
<el-row>
<el-col :span="4">
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲埆">
+ <el-select v-model="value" placeholder="璇烽�夋嫨绫诲埆" @change="getWork">
<el-option
v-for="item in options"
:key="item.value"
@@ -36,156 +166,23 @@
<el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
- <el-row gutter="5" v-show="value=='鍘熺墖'" >
- <el-col :span="4.5">
- 闀垮害 <el-input v-show="value=='鍘熺墖'" v-model="name" placeholder="璇疯緭鍏ラ暱搴�" style="width: 150px; height: 30px;" />
+ <el-row gutter="5"
+ v-for="item in BasicData" >
+ <el-col :span="4.5" >
+ {{item.OperateTypeName}}锛�<el-input v-model="item.Type" placeholder="璇疯緭鍏ユ暟鎹�" style="width: 150px; height: 30px;" />
</el-col>
- <el-col :span="4.5">
- 鍘氬害 <el-input v-show="value=='鍘熺墖'" v-model="name" placeholder="璇疯緭鍏ュ帤搴�" style="width: 150px; height: 30px;" />
- </el-col>
- <el-col :span="4.5">
- 瀹藉害 <el-input v-show="value=='鍘熺墖'" v-model="name" placeholder="璇疯緭鍏ュ搴�" style="width: 150px; height: 30px;" />
- </el-col>
-<!-- <el-col :span="4">-->
-<!-- <el-dropdown>-->
-<!-- <el-button type="primary">-->
-<!-- 鑶滅郴<el-icon class="el-icon--right" style="width: 66px;"><arrow-down /></el-icon>-->
-<!-- </el-button>-->
-<!-- <template #dropdown>-->
-<!-- <el-dropdown-menu>-->
-<!-- <el-dropdown-item>闈為晙鑶�</el-dropdown-item>-->
-<!-- <el-dropdown-item>鍦ㄧ嚎LOW-E</el-dropdown-item>-->
-<!-- <el-dropdown-item>SUPPER-I</el-dropdown-item>-->
-<!-- <el-dropdown-item>SUPPER-I+</el-dropdown-item>-->
-<!-- <el-dropdown-item>SUPPER-II</el-dropdown-item>-->
-<!-- <el-dropdown-item>SUPPER-III</el-dropdown-item>-->
-<!-- <el-dropdown-item>SUPPER-V</el-dropdown-item>-->
-<!-- <el-dropdown-item>SUPPER-IA</el-dropdown-item>-->
-<!-- <el-dropdown-item>SUNLITE LOWE</el-dropdown-item>-->
-<!-- <el-dropdown-item>LOW-E40</el-dropdown-item>-->
-<!-- <el-dropdown-item>LOW-E40A</el-dropdown-item>-->
-<!-- <el-dropdown-item>LOW-E50</el-dropdown-item>-->
-<!-- <el-dropdown-item>LOW-E55N</el-dropdown-item>-->
-<!-- </el-dropdown-menu>-->
-<!-- </template>-->
-<!-- </el-dropdown>-->
-<!-- </el-col>-->
- </el-row>
- <el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
- <el-row gutter="5" v-show="value=='鍘熺墖'|| value=='杈呮枡'">
- <el-col :span="4.5">
- 鍚嶇О <el-input v-show="value=='鍘熺墖' || value=='杈呮枡'" v-model="productName" placeholder="璇疯緭鍏ュ悕绉�" style="width: 150px; height: 30px;" />
- </el-col>
- <el-col :span="4.5">
- 鏁伴噺 <el-input v-show="value=='鍘熺墖' || value=='杈呮枡'" v-model="salId" placeholder="璇疯緭鍏ユ暟閲�" style="width: 150px; height: 30px;" />
- </el-col>
- <el-col :span="4.5">
- 鍗曚綅 <el-input v-model="name" placeholder="璇疯緭鍏ュ崟浣�" style="width: 150px; height: 30px;" />
- </el-col>
- <el-col :span="4.5">
- 鍨嬪彿<el-input v-model="name" placeholder="璇疯緭鍏ュ瀷鍙�" style="width: 150px; height: 30px;" />
- </el-col>
- </el-row>
- <el-divider v-show="false" ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
-<!-- <el-row gutter="5">-->
-<!-- <el-col span="4.5">-->
-<!-- <el-input v-model="name" placeholder="璇疯緭鍏ユ崲绠楀崟浣�" style="width: 150px; height: 30px;" />-->
-<!-- </el-col>-->
-<!-- <el-col :span="4.5">-->
-<!-- <el-input v-model="name" placeholder="璇疯緭鍏ユ崲绠楃巼" style="width: 150px; height: 30px;" />-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-
- <el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
-
- <el-row gutter="5">
-
-
+ <el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
</el-row>
-<!-- <el-divider ></el-divider> <!– 娣诲姞鍒嗛殧绾� –>-->
-<!-- <el-row gutter="5">-->
-<!-- <el-col :span="4.5">-->
-<!-- <el-input v-model="name" placeholder="璇疯緭鍏ュ瀷鍙�" style="width: 150px; height: 30px;" />-->
-<!-- </el-col>-->
-
-<!-- <el-col :span="4.5">-->
-<!-- <el-input v-model="name" placeholder="璇疯緭鍏ュ崟浣�" style="width: 150px; height: 30px;" />-->
-<!-- </el-col>-->
-<!-- <el-col :span="4">-->
-<!-- <el-dropdown>-->
-<!-- <el-button type="primary">-->
-<!-- 浜у湴<el-icon class="el-icon--right" style="width: 66px;"><arrow-down /></el-icon>-->
-<!-- </el-button>-->
-<!-- <template #dropdown>-->
-<!-- <el-dropdown-menu>-->
-<!-- <el-dropdown-item>鏆傛棤</el-dropdown-item>-->
-<!-- </el-dropdown-menu>-->
-<!-- </template>-->
-<!-- </el-dropdown>-->
-<!-- </el-col>-->
-<!-- <el-col :span="4">-->
-<!-- <el-dropdown>-->
-<!-- <el-button type="primary">-->
-<!-- 涓被<el-icon class="el-icon--right" style="width: 66px;"><arrow-down /></el-icon>-->
-<!-- </el-button>-->
-<!-- <template #dropdown>-->
-<!-- <el-dropdown-menu>-->
-<!-- <el-dropdown-item>0</el-dropdown-item>-->
-<!-- </el-dropdown-menu>-->
-<!-- </template>-->
-<!-- </el-dropdown>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-
-
-<!-- <el-divider ></el-divider> <!– 娣诲姞鍒嗛殧绾� –>-->
-
-<!-- <el-row gutter="5">-->
-
-
-<!-- <el-col :span="4.5">-->
-<!-- <el-input v-model="name" placeholder="璇疯緭鍏ュ娉�" style="width: 150px; height: 30px;" />-->
-<!-- </el-col>-->
-<!-- <el-col :span="4">-->
-<!-- <el-dropdown>-->
-<!-- <el-button type="primary">-->
-<!-- 灏忕被<el-icon class="el-icon--right" style="width: 66px;"><arrow-down /></el-icon>-->
-<!-- </el-button>-->
-<!-- <template #dropdown>-->
-<!-- <el-dropdown-menu>-->
-<!-- <el-dropdown-item>0</el-dropdown-item>-->
-<!-- </el-dropdown-menu>-->
-<!-- </template>-->
-<!-- </el-dropdown>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-
-<!-- <el-divider ></el-divider> <!– 娣诲姞鍒嗛殧绾� –>-->
-
-
-<!-- <el-row gutter="5">-->
-<!--<!– <el-col :span="4.5">–>-->
-<!--<!– <el-input v-model="name" placeholder="璇疯緭鍏ヤ繚璐ㄦ湡" style="width: 150px; height: 30px;" />–>-->
-<!--<!– </el-col>–>-->
-<!--<!– <el-col :span="4.5">–>-->
-<!--<!– <el-input v-model="name" placeholder="璇疯緭鍏ユ渶楂橀璀�" style="width: 150px; height: 30px;" />–>-->
-<!--<!– </el-col>–>-->
-<!--<!– <el-col :span="4.5">–>-->
-<!--<!– <el-input v-model="name" placeholder="璇疯緭鍏ユ媶鍖呴璀�" style="width: 150px; height: 30px;" />–>-->
-<!--<!– </el-col>–>-->
-
-<!-- </el-row>-->
-<!-- <el-divider ></el-divider> <!– 娣诲姞鍒嗛殧绾� –>-->
<el-row gutter="10" justify="center" >
<el-col span="4">
- <el-button id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
+ <el-button id="searchButton" type="primary" @click="resetForm" >閲嶇疆</el-button>
</el-col>
<el-col span="4">
- <el-button id="searchButton" type="primary" :icon="Search">纭畾</el-button>
+ <el-button id="searchButton" type="primary" @click="submitForm" >淇濆瓨</el-button>
</el-col>
</el-row>
</el-form>
--
Gitblit v1.8.0