ERP_override.git

			@@ -1758,7 +1758,7 @@
			:value="item.id"/>
			</el-select>
			</el-col>
			<el-col :span="2"><el-text>{{$t('order.alType')}}</el-text></el-col>
			<el-col :span="2"><el-text style="white-space: nowrap;">{{$t('order.alType')}}</el-text></el-col>
			<el-col :span="2">
			<el-select v-model="titleUploadData.alType" clearable placeholder=" " >
			<el-option v-for="item in titleSelectJson['alType']"

			@@ -152,6 +152,10 @@
			productTotal.value.id = null
			productTotal.value.state = 0
			}
			/*if(productTotal.value.id!==null && productTotal.value.creator!==userInfo.user.userName){
			ElMessage.warning('创建人是：'+productTotal.value.creator+' 无法操作！')
			return;
			}*/

			let product = {
			title: productTotal.value,
			@@ -173,7 +177,7 @@
			if(props.productFlag===false){
			product.title.state = 1
			}
			request.post(`/product/saveProduct`,product).then((res) =>{
			request.post(`/product/saveProduct/${userInfo.user.userName}`,product).then((res) =>{
			if(res.code==200){
			ElMessage.success(t('product.msg.saveSuccess'))
			if(props.productFlag===false){
			@@ -187,7 +191,7 @@

			//审核产品状态
			const updateProductState = (state) => {
			request.post(`/product/updateProductStateById/${productTotal.value.id}/${state}`).then((res) =>{
			request.post(`/product/updateProductStateById/${productTotal.value.id}/${state}/${userInfo.user.userName}`).then((res) =>{
			if(res.code==200){
			ElMessage.success(t('product.msg.operateSuccess'))
			//router.go(0)

			@@ -8,11 +8,13 @@
			import GlassType from "@/components/sd/product/GlassType.vue"
			import {useRouter} from 'vue-router'
			import {columnDrop2,sortable2} from "@/hook/columnMove"
			import useUserInfo from "@/stores/userInfo"
			import Sortable from 'sortablejs'
			import BasicTable from '@/components/sd/product/BasicTable.vue'
			import {VXETable} from "vxe-table";
			import {useI18n} from "vue-i18n";
			const { t } = useI18n()
			let userInfo = useUserInfo()
			let productGlassTypeStore = useProductGlassTypeStore()
			let router=useRouter()
			//监听玻璃类型改变
			@@ -155,7 +157,7 @@
			break
			}
			case 'delete': {
			request.post(`/product/deleteProductById/${row.id}`).then((res) => {
			request.post(`/product/deleteProductById/${row.id}/${userInfo.user.userName}`).then((res) => {
			if(res.code==200){
			router.push({path:"/main/product/selectProduct",query:{random:Math.random()}})
			ElMessage.success(t('basicData.msg.deleteSuccess'))

	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史