bug修改

src/lang/cn.js

@@ -566,7 +566,7 @@ export const lang = {
 
 	},
 	productLibrary: {
-		//产品库，产品分类，产品编码，产品名称,产品类型,成品,半成品,规格型号,单位，文件上传，备注，产品分类不能为空，产品类型不能为空，产品名称不能为空，规格型号不能为空，单位不能为空，请选择，请选择时间，请选择级联
+		//产品库，产品分类，产品编码，产品名称,产品类型,成品,半成品,规格型号,单位，文件上传，备注，产品分类不能为空，产品类型不能为空，产品名称不能为空，规格型号不能为空，单位不能为空，请选择，请选择时间，请选择级联,标准产品库
 		name: '产品库',
 		productClassification: '产品分类',
 		productCode: '产品编码',
@@ -586,6 +586,7 @@ export const lang = {
 		pleaseSelect: '请选择',
 		pleaseSelectTime: '请选择时间',
 		pleaseSelectCascader: '请选择级联',
+		standardProductLibrary: '标准产品库',
 
 	},
 	productClassification: {

src/lang/index.js

@@ -15,7 +15,7 @@ const i18n = createI18n({
     'en-us': require('./en.js').lang,
   }
 })
-console.log(require('./en.js').lang)
+//console.log(require('./en.js').lang)
 //get('/open/multilingual/getJson',{}).then(res=>{
   // console.log(JSON.parse(res.data),'下载')
   // window.localStorage.setItem('lang',res.data)

src/router/index.js

@@ -502,7 +502,7 @@ const routes = [{
 				component: () => import("../views/product-material/standard-product-library/index.vue"),
 			},
 			{
-				path: "productLibraryAdd",
+				path: "standardProductLibraryAdd",
 				name: "标准产品库添加",
 				component: () => import("../views/product-material/standard-product-library/add.vue"),
 			}

src/views/processApproval/processDtl.vue

@@ -15,7 +15,7 @@
 			</div>
 			<div class="foot-btn-warp" v-if="route.query.processType != 20">
 				<div class="agree-btn" @click="handleSubmit(1)">同意</div>
-				<div class="next-btn" @click="nextFn">下一步</div>
+				<div class="next-btn" @click="nextFn" v-if="componentObj[route.query.flowKey].tabsNum">下一步</div>
 			</div>
 		</div>
 		<van-action-sheet v-model:show="footerMoreType" title="审批记录" class="more-modal">
@@ -51,7 +51,7 @@
 			<div class="content">
 				<div class="foot-btn-warp">
 					<div class="agree-btn" @click="handleSubmit(1)">同意</div>
-					<div class="next-btn" @click="nextFn">下一步</div>
+					<div class="next-btn" @click="nextFn" v-if="componentObj[route.query.flowKey].tabsNum">下一步</div>
 				</div>
 			</div>
 		</van-action-sheet>
@@ -103,21 +103,25 @@ let componentObj = ref({
 		title: '申购',
 		component: SendSubscribe,
 		backUrl: '/main/subscribe',
+		tabsNum: 2,
 	},
 	account_request_funds_flow: {
 		title: '请款',
 		component: SendFunds,
 		backUrl: '/main/funds',
+		tabsNum: 3,
 	},
 	sale_quotation_flow: {
 		title: '报价单',
 		component: PriceSheet,
 		backUrl: '/main/priceSheet',
+		tabsNum: 4,
 	},
 	contract_flow: {
 		title: '销售合同',
 		component: Contract,
 		backUrl: '/main/contract',
+		tabsNum: 5,
 	},
 	
 		purchase_flow: {

src/views/product-material/product-library/add.vue

@@ -31,6 +31,7 @@ const show = ref(false);
 const typeModal = ref(false);
 const unitModal = ref(false);
 const classification = ref([]);
+
 const formData = reactive({
   data: {
   },

src/views/product-material/product-library/add2.vue

@@ -7,6 +7,7 @@
 			@click-left="onClickLeft"
 		>
 		</van-nav-bar>
+    
 		<van-form
 			@submit="onSubmit"
 			label-align="top"

src/views/product-material/product-library/index.vue

@@ -30,7 +30,7 @@ const classification = ref([]);
 const listConfig = ref([
   {
     label: proxy.t('productLibrary.productClassification'),
-    prop: "productClassifyName",
+    prop: "classifyName",
   },
   {
     label: proxy.t('productLibrary.productCode'),

src/views/product-material/standard-product-library/add.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="form">
 		<van-nav-bar
-			:title="$t('productLibrary.name')"
+			:title="$t('productLibrary.standardProductLibrary')"
 			:left-text="$t('common.back')"
 			left-arrow
 			@click-left="onClickLeft"
@@ -154,7 +154,7 @@ const fileList = ref([]);
 const onClickLeft = () => history.back();
 const onSubmit = () => {
   console.log(formData)
-  
+  formData.data.definition = "1";
   proxy.post("/productInfo/" + route.query.type, formData.data).then(() => {
     showSuccessToast(proxy.t('common.addSuccess'));
     setTimeout(() => {

src/views/product-material/standard-product-library/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-nav-bar :title="$t('productLibrary.name')" left-text="" left-arrow @click-left="onClickLeft" @click-right="onClickRight">
+    <van-nav-bar :title="$t('productLibrary.standardProductLibrary')" left-text="" left-arrow @click-left="onClickLeft" @click-right="onClickRight">
       <template #right> {{$t('common.add')}} </template>
     </van-nav-bar>
     <van-search v-model="req.keyword" :placeholder="$t('common.pleaseEnterKeywords')" @search="onRefresh" />
@@ -30,7 +30,7 @@
   const listConfig = ref([
     {
       label: proxy.t('productLibrary.productClassification'),
-      prop: "productClassifyName",
+      prop: "classifyName",
     },
     {
       label: proxy.t('productLibrary.productCode'),
@@ -52,7 +52,7 @@
   const onClickLeft = () => proxy.$router.push("/main/working");
   const onClickRight = () => {
     proxy.$router.push({
-      path: "productLibraryAdd",
+      path: "standardProductLibraryAdd",
       query: {
           type: 'add'
       },
@@ -61,7 +61,7 @@
   proxy.uploadDdRightBtn(onClickRight,proxy.t('common.add'))
   const toDtl = (row) => {
     proxy.$router.push({
-      path: "productLibraryAdd",
+      path: "standardProductLibraryAdd",
       query: {
         id: row.id,
         type: 'edit'