Przeglądaj źródła

工单更名为制作单

shish 4 lat temu
rodzic
commit
e176a887bc

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

@@ -93,7 +93,7 @@ export default {
       },
       tabsData: [
         { name: "商城", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/admin/cg/mall",pf:1},
-        { name: "单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
+        { name: "制作单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:0},
         { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:0 },

+ 4 - 4
hdApp/src/admin/work/detail.vue

@@ -2,22 +2,22 @@
 	<view class="app-content">
 		<view class="info-content_box">
 			<view class="title">
-				单信息
+				单信息
 			</view>
 			<view class="bills-info_box content-box">
 				<view class="order-info_box">
-					<view>单日期:</view>
+					<view>单日期:</view>
 					<view>{{ detailInfo.addTime.substr(5,11) }}</view>
 				</view>
 				<view class="order-info_box">
-					<view>单编号:</view>
+					<view>单编号:</view>
 					<view>{{ detailInfo.orderSn }}</view>
 					<view class="price">
 						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default">复制</button>
 					</view>
 				</view>
 				<view class="order-info_box">
-					<view>单状态:</view>
+					<view>单状态:</view>
 					<view>{{ detailInfo.status==0?'待完成':detailInfo.status==1?'已完成':detailInfo.status==2?'已取消':'待完成' }}</view>
 				</view>
 			</view>

+ 1 - 1
hdApp/src/pages.json

@@ -12,7 +12,7 @@
 		{
 			"root": "admin/work",
 			"pages": [
-				{"path": "add","style": {"navigationBarTitleText": "新建单"}},
+				{"path": "add","style": {"navigationBarTitleText": "新建制作单"}},
 				{"path": "addResult","style": {"navigationBarTitleText": "新建成功"}},
 				{"path": "list","style": {"navigationBarTitleText": "列表","enablePullDownRefresh": true}},
 				{"path": "detail","style": {"navigationBarTitleText": "详情"}}

+ 4 - 4
hdPad/src/api/work/index.js

@@ -1,16 +1,16 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
-//单列表
+//制作单列表
 export const getWorkList = data => {
 	return https.get('/work/list', data)
 }
 
-//单详情
+//制作单详情
 export const getFullInfo = data => {
 	return https.get('/work/full-info', data)
 }
 
-//完成单 ssh 20220425
+//完成制作单 ssh 20220425
 export const finish = data =>{
 	return https.post('/work/finish', data)
 }
@@ -23,7 +23,7 @@ export const cancelWork = data => {
 	return https.get('/work/cancel', data)
 }
 
-//创建单 ssh 20220426
+//创建制作单 ssh 20220426
 export const createWorkFn = data => {
 	return https.post('/work/create', data)
 }

+ 1 - 1
hdPad/src/pages.json

@@ -1,7 +1,7 @@
 {
 	"pages": [
 		{"path": "pages/home/cash","style": {"navigationBarTitleText": "收银"}},
-		{"path": "pages/home/work","style": {"navigationBarTitleText": "单"}},
+		{"path": "pages/home/work","style": {"navigationBarTitleText": "制作单"}},
 		{"path": "pages/home/modify","style": {"navigationBarTitleText": "修改"}},
 		{"path": "pages/home/make","style": {"navigationBarTitleText": "制作"}},
 		{"path": "pages/home/selectMake","style": {"navigationBarTitleText": "选款"}},

+ 1 - 1
hdPad/src/pages/home/components/nav.vue

@@ -15,7 +15,7 @@ export default {
     return {
       nav: [
         { name: "收银", page: "/pages/home/cash" },
-        { name: "工单", page: "/pages/home/work" },
+        { name: "制作", page: "/pages/home/work" },
         { name: "选款", page: "/pages/home/selectMake" },
         { name: "新款", page: "/pages/home/make" },
       ],

+ 4 - 4
hdPad/src/pages/home/components/workInfo.vue

@@ -1,7 +1,7 @@
 <template>
 <view>
   <view v-if="$util.isEmpty(orderInfo)" class="work-empty">
-    <text>暂无单</text>
+    <text>暂无制作单</text>
   </view>  
   <view class="work-info" v-else>
     <view class="work-detail">
@@ -15,7 +15,7 @@
         <view><text class="left">数量</text><text class="right">{{orderInfo.num}}</text></view>
         <view><text class="left">商品编号</text><text class="right">{{orderInfo.goodsId}}</text></view>
         <view><text class="left">售价</text><text class="right">{{orderInfo.price||''}}</text></view>
-        <view><text class="left">单号</text><text class="right">{{orderInfo.workSn}}</text></view>
+        <view><text class="left">单号</text><text class="right">{{orderInfo.workSn}}</text></view>
         <view><text class="left">订单号</text><text class="right">{{orderInfo.orderSn}}</text></view>
         <view><text class="left">状态</text><text class="right">{{getStatus(orderInfo.status)}}</text></view>
         <view><text class="left">备注</text><text class="right">{{orderInfo.remark}}</text></view>
@@ -85,7 +85,7 @@
     </uni-popup>
 
     <uni-popup ref="cancelWorkRef" type="dialog">
-        <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认取消工单?" @confirm="confirmCancel"></uni-popup-dialog>
+        <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认取消?" @confirm="confirmCancel"></uni-popup-dialog>
     </uni-popup>
 
     <uni-popup ref="lockWorkRef" type="dialog">
@@ -140,7 +140,7 @@ export default {
         }else{
           let currentNum = parseFloat(Number(info.num))
           if(Number(currentNum)<0){
-            this.$msg('工单数量错误')
+            this.$msg('数量错误')
             return false
           }
           let data = []

+ 1 - 1
hdPad/src/pages/home/make.vue

@@ -20,7 +20,7 @@
 				</view>
             </view>
 
-			<!-- 完成单弹框 -->
+			<!-- 完成制作单弹框 -->
 			<uni-popup ref="createWorkRef" background-color="#fff" type="right">
 				<createWork @cancelCreate="cancelCreate()" @confirmCreate="confirmCreate()"></createWork>
 			</uni-popup>