ERP_override.git

			@@ -295,7 +295,7 @@


			<div class="main-div-customer">
			<div>
			<div class="head">
			<el-row>
			<el-col :span="4">
			<el-select v-model="value" :placeholder="$t('mainIngredient.pleaseSelectACategory')" @change="getWork">
			@@ -310,7 +310,7 @@
			</el-row>
			</div>


			<div class="main-table">
			<vxe-grid
			max-height="100%"
			class="mytable-scrollbar"
			@@ -318,6 +318,8 @@
			v-bind="gridOptions"

			>


			<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
			<template #content="{ row }">
			<ul class="expand-wrapper">
			@@ -365,6 +367,7 @@

			</vxe-grid>
			</div>
			</div>
			</template>

			<style scoped>
			@@ -372,4 +375,13 @@
			width: 99%;
			height: 100%;
			}
			.head{
			width: 100%;
			height: 35px;
			}

			.main-table{
			width: 100%;
			height: calc(100% - 35px);
			}
			</style>

			@@ -609,6 +609,7 @@

			<template>
			<div class="main-div-customer">
			<div class="head">
			<el-date-picker
			v-model="selectDate"
			type="daterange"
			@@ -631,7 +632,9 @@
			</el-select>
			</el-row>
			</div>
			</div>

			<div class="main-table">
			<vxe-grid
			max-height="100%"
			class="mytable-scrollbar"
			@@ -682,6 +685,7 @@


			</vxe-grid>
			</div>

			<el-dialog v-model="dialogTableVisible" :title="$t('mainIngredient.materialAddition')" style="width: 70%;height:75% ">
			<div class="order-primary" >
			@@ -773,4 +777,13 @@
			.order-primary{
			width: 100%;
			}
			.head{
			width: 100%;
			height: 35px;
			}

			.main-table{
			width: 100%;
			height: calc(100% - 35px);
			}
			</style>

			@@ -108,7 +108,7 @@

			})

			const saveProduct = () => {
			const saveProduct = (type) => {
			if(productDetailList.value.length===0){
			ElMessage.warning(t('product.msg.productLength'))
			return
			@@ -140,6 +140,11 @@
			})
			productTotal.value.productName=productName
			productTotal.value.productAbbreviation=productTotal.value.productAbbreviation.trim()
			if(type==='copy'){
			productTotal.value.id = null
			productTotal.value.state = 0
			}

			let product = {
			title: productTotal.value,
			detail:productDetailList.value
			@@ -404,6 +409,7 @@
			})
			return productName
			})




			@@ -789,8 +795,16 @@

			</div>
			<el-button
			v-if="productTotal.state===1"
			@click="saveProduct('copy')"
			style="float: left;
			margin-left: 0.5rem;"
			size="large"
			type="primary"
			round>{{"复制"}}</el-button>
			<el-button
			:disabled="productTotal.state===1"
			@click="saveProduct"
			@click="saveProduct(null)"
			style="float: right;
			margin-right: 0.5rem;"
			size="large"

	north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史