shish 3 лет назад
Родитель
Сommit
f4c449fdd2

+ 3 - 3
ghsApp/src/admin/item/add.vue

@@ -300,7 +300,7 @@ export default {
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.form.classId = this.itemClassSelectedData.id;
         this.form.classId = this.itemClassSelectedData.id;
     },
     },
-    //从平台导入花材 shish 20210826
+    //从平台选择花材 shish 20210826
     getPtItemInfo(ptItemId){
     getPtItemInfo(ptItemId){
       getPtItemDetail({id:ptItemId}).then(res=>{
       getPtItemDetail({id:ptItemId}).then(res=>{
 
 
@@ -365,7 +365,7 @@ export default {
       this.form.cover.splice(index,1)
       this.form.cover.splice(index,1)
     },
     },
     init() {
     init() {
-      //从平台导入花材
+      //从平台选择花材
       if(!this.$util.isEmpty(this.option.ptItemId)){
       if(!this.$util.isEmpty(this.option.ptItemId)){
         uni.setNavigationBarTitle({title: "确认花材信息"})
         uni.setNavigationBarTitle({title: "确认花材信息"})
       }
       }
@@ -378,7 +378,7 @@ export default {
           if(this.form.id == 0){
           if(this.form.id == 0){
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
-            //从平台导入花材
+            //从平台选择花材
             if(!this.$util.isEmpty(this.option.ptItemId)){
             if(!this.$util.isEmpty(this.option.ptItemId)){
               this.getPtItemInfo(this.option.ptItemId)
               this.getPtItemInfo(this.option.ptItemId)
             }
             }

+ 3 - 3
ghsApp/src/admin/item/copy.vue

@@ -295,7 +295,7 @@ export default {
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.form.classId = this.itemClassSelectedData.id;
         this.form.classId = this.itemClassSelectedData.id;
     },
     },
-    //从平台导入花材 shish 20210826
+    //从平台选择花材 shish 20210826
     getPtItemInfo(ptItemId){
     getPtItemInfo(ptItemId){
       getPtItemDetail({id:ptItemId}).then(res=>{
       getPtItemDetail({id:ptItemId}).then(res=>{
 
 
@@ -361,7 +361,7 @@ export default {
       this.form.cover.splice(index,1)
       this.form.cover.splice(index,1)
     },
     },
     init() {
     init() {
-      //从平台导入花材
+      //从平台选择花材
       if(!this.$util.isEmpty(this.option.ptItemId)){
       if(!this.$util.isEmpty(this.option.ptItemId)){
         uni.setNavigationBarTitle({title: "确认花材信息"})
         uni.setNavigationBarTitle({title: "确认花材信息"})
       }
       }
@@ -374,7 +374,7 @@ export default {
           if(this.form.id == 0){
           if(this.form.id == 0){
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
-            //从平台导入花材
+            //从平台选择花材
             if(!this.$util.isEmpty(this.option.ptItemId)){
             if(!this.$util.isEmpty(this.option.ptItemId)){
               this.getPtItemInfo(this.option.ptItemId)
               this.getPtItemInfo(this.option.ptItemId)
             }
             }

+ 3 - 3
ghsApp/src/admin/item/detail.vue

@@ -406,7 +406,7 @@ export default {
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.form.classId = this.itemClassSelectedData.id;
         this.form.classId = this.itemClassSelectedData.id;
     },
     },
-    //从平台导入花材 shish 20210826
+    //从平台选择花材 shish 20210826
     getPtItemInfo(ptItemId){
     getPtItemInfo(ptItemId){
       getPtItemDetail({id:ptItemId}).then(res=>{
       getPtItemDetail({id:ptItemId}).then(res=>{
 
 
@@ -479,7 +479,7 @@ export default {
       this.form.cover.splice(index,1)
       this.form.cover.splice(index,1)
     },
     },
     init() {
     init() {
-      //从平台导入花材
+      //从平台选择花材
       if(!this.$util.isEmpty(this.option.ptItemId)){
       if(!this.$util.isEmpty(this.option.ptItemId)){
         uni.setNavigationBarTitle({title: "确认花材信息"})
         uni.setNavigationBarTitle({title: "确认花材信息"})
       }
       }
@@ -492,7 +492,7 @@ export default {
           if(this.form.id == 0){
           if(this.form.id == 0){
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
-            //从平台导入花材
+            //从平台选择花材
             if(!this.$util.isEmpty(this.option.ptItemId)){
             if(!this.$util.isEmpty(this.option.ptItemId)){
               this.getPtItemInfo(this.option.ptItemId)
               this.getPtItemInfo(this.option.ptItemId)
             }
             }

+ 1 - 1
ghsApp/src/admin/ptItem/itemList.vue

@@ -3,7 +3,7 @@
 	<view class="billing_box_bg">
 	<view class="billing_box_bg">
     <view class="input-wrap">
     <view class="input-wrap">
 			<view class="search-bar">
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFnContrapose"/>
+				<app-search-module v-model="py" placeholder="搜索要找的花材" @input="searchFnContrapose"/>
 			</view>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
 			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">新花材</button>
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">新花材</button>

+ 1 - 1
ghsApp/src/pages.json

@@ -29,7 +29,7 @@
 		{
 		{
 			"root": "admin/ptItem",
 			"root": "admin/ptItem",
 			"pages": [
 			"pages": [
-				{"path": "itemList","style": {"navigationBarTitleText": "从平台导入花材","onReachBottonDistance":20}}
+				{"path": "itemList","style": {"navigationBarTitleText": "从平台选择花材","onReachBottonDistance":20}}
 			]
 			]
 		},
 		},
 		{
 		{

+ 1 - 1
ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -251,7 +251,7 @@ export default {
 		border-radius: 20upx;
 		border-radius: 20upx;
 		z-index: 1;
 		z-index: 1;
 		.iconchenggong {
 		.iconchenggong {
-			font-size: 170upx;
+			font-size: 150upx;
 			color: $mainColor1;
 			color: $mainColor1;
 		}
 		}
 		.result-title {
 		.result-title {

+ 1 - 1
hdApp/src/admin/home/workbench.vue

@@ -96,7 +96,7 @@
     <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
     <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
     <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="suggest()">改进建议</button>
     <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="suggest()">改进建议</button>
     <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽列表</button>
     <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽列表</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启完整功能</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启零售功能</button>
   </view>
   </view>
 
 
   <template v-if="!$util.isEmpty(supplierList)">
   <template v-if="!$util.isEmpty(supplierList)">

+ 3 - 3
hdApp/src/admin/item/add.vue

@@ -315,7 +315,7 @@ export default {
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.form.classId = this.itemClassSelectedData.id;
         this.form.classId = this.itemClassSelectedData.id;
     },
     },
-    //从平台导入花材 shish 20210826
+    //从平台选择花材 shish 20210826
     getPtItemInfo(ptItemId){
     getPtItemInfo(ptItemId){
       getPtItemDetail({id:ptItemId}).then(res=>{
       getPtItemDetail({id:ptItemId}).then(res=>{
 
 
@@ -378,7 +378,7 @@ export default {
       this.form.cover.splice(index,1)
       this.form.cover.splice(index,1)
     },
     },
     init() {
     init() {
-      //从平台导入花材
+      //从平台选择花材
       if(!this.$util.isEmpty(this.option.ptItemId)){
       if(!this.$util.isEmpty(this.option.ptItemId)){
         uni.setNavigationBarTitle({title: "确认花材信息"})
         uni.setNavigationBarTitle({title: "确认花材信息"})
       }
       }
@@ -391,7 +391,7 @@ export default {
           if(this.form.id == 0){
           if(this.form.id == 0){
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
-            //从平台导入花材
+            //从平台选择花材
             if(!this.$util.isEmpty(this.option.ptItemId)){
             if(!this.$util.isEmpty(this.option.ptItemId)){
               this.getPtItemInfo(this.option.ptItemId)
               this.getPtItemInfo(this.option.ptItemId)
             }
             }

+ 3 - 3
hdApp/src/admin/item/detail.vue

@@ -240,7 +240,7 @@ export default {
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.itemClassSelectedData = this.itemClassData[e.detail.value];
         this.form.classId = this.itemClassSelectedData.id;
         this.form.classId = this.itemClassSelectedData.id;
     },
     },
-    //从平台导入花材 shish 20210826
+    //从平台选择花材 shish 20210826
     getPtItemInfo(ptItemId){
     getPtItemInfo(ptItemId){
       getPtItemDetail({id:ptItemId}).then(res=>{
       getPtItemDetail({id:ptItemId}).then(res=>{
 
 
@@ -295,7 +295,7 @@ export default {
       this.form.cover.splice(index,1)
       this.form.cover.splice(index,1)
     },
     },
     init() {
     init() {
-      //从平台导入花材
+      //从平台选择花材
       if(!this.$util.isEmpty(this.option.ptItemId)){
       if(!this.$util.isEmpty(this.option.ptItemId)){
         uni.setNavigationBarTitle({title: "确认花材信息"})
         uni.setNavigationBarTitle({title: "确认花材信息"})
       }
       }
@@ -308,7 +308,7 @@ export default {
           if(this.form.id == 0){
           if(this.form.id == 0){
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.smallUnitSelectedData = this.unitData.filter(e => 2 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
             this.bigUnitSelectedData = this.unitData.filter(e => 1 == e.id)[0];
-            //从平台导入花材
+            //从平台选择花材
             if(!this.$util.isEmpty(this.option.ptItemId)){
             if(!this.$util.isEmpty(this.option.ptItemId)){
               this.getPtItemInfo(this.option.ptItemId)
               this.getPtItemInfo(this.option.ptItemId)
             }
             }

+ 2 - 2
hdApp/src/pages.json

@@ -26,7 +26,7 @@
 		{
 		{
 			"root": "admin/ptItem",
 			"root": "admin/ptItem",
 			"pages": [
 			"pages": [
-				{"path": "itemList","style": {"navigationBarTitleText": "从平台导入花材","onReachBottonDistance":20}}
+				{"path": "itemList","style": {"navigationBarTitleText": "从平台选择花材","onReachBottonDistance":20}}
 			]
 			]
 		},
 		},
 		{
 		{
@@ -383,7 +383,7 @@
 				{ "path": "details", "style": { "navigationBarTitleText": "确认订单" } },
 				{ "path": "details", "style": { "navigationBarTitleText": "确认订单" } },
 				{ "path": "order", "style": { "navigationBarTitleText": "供货商", "enablePullDownRefresh": true } },
 				{ "path": "order", "style": { "navigationBarTitleText": "供货商", "enablePullDownRefresh": true } },
 				{ "path": "pb", "style": { "navigationBarTitleText": "已屏蔽商家", "enablePullDownRefresh": true } },
 				{ "path": "pb", "style": { "navigationBarTitleText": "已屏蔽商家", "enablePullDownRefresh": true } },
-				{ "path": "open", "style": { "navigationBarTitleText": "开启完整功能", "enablePullDownRefresh": true } },
+				{ "path": "open", "style": { "navigationBarTitleText": "开启零售功能", "enablePullDownRefresh": true } },
 				{ "path": "shopping", "style": { "navigationBarTitleText": "采购", "enablePullDownRefresh": true } },
 				{ "path": "shopping", "style": { "navigationBarTitleText": "采购", "enablePullDownRefresh": true } },
 				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "setPsd", "style": { "navigationBarTitleText": "设置密码", "enablePullDownRefresh": true } },
 				{ "path": "setPsd", "style": { "navigationBarTitleText": "设置密码", "enablePullDownRefresh": true } },

+ 1 - 1
hdApp/src/pagesPurchase/order.vue

@@ -5,7 +5,7 @@
       <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
       <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
       <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="suggest()">改进建议</button>
       <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="suggest()">改进建议</button>
       <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽列表</button>
       <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽列表</button>
-      <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启完整功能</button>
+      <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启零售功能</button>
     </view>
     </view>
 
 
 <template v-if="!$util.isEmpty(supplierList)">
 <template v-if="!$util.isEmpty(supplierList)">