文字优化

hdApp/src/admin/breakage/index.vue

@@ -100,7 +100,7 @@ import ModalModule from "@/components/plugin/modal";
 import { COMMODITY_TYPE } from "@/utils/declare";
 import productMins from "@/mixins/product";
 export default {
-	name: "WastageBilling",//报损
+	name: "WastageBilling",//损耗
 	components: {
 		AppTabs,
 		AppSearchModule,

hdApp/src/admin/breakage/list.vue

@@ -18,7 +18,7 @@
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
       <view class="app-footer open_btn">
-        <view @click="selectProduct" class="admin-button-com big blue">新增报损</view>
+        <view @click="selectProduct" class="admin-button-com big blue">新增损耗</view>
       </view>
   </div>
 </template>

hdApp/src/admin/goods/cgNewPlant.vue

@@ -4,8 +4,8 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">名称</view>
-          <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请填写名称" maxlength="50" type="text" />
+          <view class="tui-title">种类</view>
+          <view style="color:#3385FF">{{option.kindName ? option.kindName : ''}}</view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -85,7 +85,6 @@ export default {
     return {
       currentImgData: [],
       form: {
-        name:"",
         cgPrice:'',
         shopImg:[],
         status:2,
@@ -150,9 +149,15 @@ export default {
         uni.showToast({title:"请填写销售单价哦",icon:"none"})
         return;
       }
+      let kindId = this.option.kindId ? this.option.kindId : 0
+      if(Number(kindId) <= 0){
+        this.$msg('请选择种类')
+        return false
+      }
+      let kindName = this.option.kindName ? this.option.kindName : ''
       let form = JSON.parse(JSON.stringify(this.form))
       uni.showLoading({mask:true})
-      cgPlant({...form}).then(res => {
+      cgPlant({...form,kindId:kindId,name:kindName,kindName:kindName}).then(res => {
         uni.hideLoading()
         if(res.code == 1){
           this.pageTo({url: '/admin/goods/cgNewPlantResult',type:2,query:{id:res.data.id}})
@@ -161,11 +166,6 @@ export default {
     },
     formSubmit(e) {
       let rules = [
-        {
-          name: "name",
-          rule: ["required"],
-          msg: ["请填写名称"]
-        },
         {
           name: "num",
           rule: ["required"],

hdApp/src/admin/goods/plantCg.vue

@@ -94,7 +94,7 @@ export default {
       this.pageTo({url:'/admin/goods/plant'})
     },
     addNewEvent(){
-      this.pageTo({url:'/admin/goods/selectKind'})
+      this.pageTo({url:'/admin/goods/selectKind?flower=0'})
     },
   }
 }

hdApp/src/admin/goods/plantCgDetail.vue

@@ -3,9 +3,13 @@
     <view class="info-content_box">
       <view class="bills-info_box content-box">
         <view class="order-info_box">
-          <view>订单日期：</view>
+          <view>创建时间：</view>
           <view>{{ detailInfo.addTime ? detailInfo.addTime.substr(5, 11) : '' }}</view>
         </view>
+        <view v-if="detailInfo.status==1" class="order-info_box">
+          <view>过期时间：</view>
+          <view>{{ detailInfo.deadline ? detailInfo.deadline.substring(0, 16) : '' }}</view>
+        </view>
         <view class="order-info_box">
           <view>订单编号：</view>
           <view>{{ detailInfo.orderSn }}</view>
@@ -13,10 +17,6 @@
             <button @click="copy(detailInfo.orderSn)" class="admin-button-com default">复制</button>
           </view>
         </view>
-        <view v-if="detailInfo.status==1" class="order-info_box">
-          <view>过期时间：</view>
-          <view>{{ detailInfo.deadline ? detailInfo.deadline.substring(0, 16) : '' }}</view>
-        </view>
         <view class="order-info_box">
           <view>采购人员：</view>
           <view>{{ detailInfo.staffName }}</view>
@@ -26,11 +26,18 @@
           <view>{{ detailInfo.status==0?'待付款' :detailInfo.status==1?'待配送' :detailInfo.status==2?'配送中' :detailInfo.status==3?'已完成' :detailInfo.status==4?'已取消' :'待付款' }}</view>
         </view>
       </view>
-
+      <view v-if="detailInfo.remark !=''" class="content-box price-detail">
+        <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">备注</div>
+            <div style="color:red;">{{detailInfo.remark}}</div>
+          </tui-list-cell>
+        </div>
+      </view>
       <view class="module-com content-box proInfo">
         <view class="commodity-view">
           <view class="infoAEdit">
-            <text>商品信息</text> <text @click="printAllLabel(detailInfo)" style="float:right;font-weight:normal;color:#3385FF;margin-right:10upx;">打全部标签</text>
+            <text>商品信息</text> <text @click="printAllLabel(detailInfo)" style="float:right;font-weight:normal;color:#3385FF;margin-right:10upx;font-size:28upx;">打全部标签</text>
           </view>
           <view class="commodity-list">
             <view v-for="(s, idx) in itemList" :key="idx" class="commodity-item" >
@@ -41,27 +48,19 @@
                   <text class="item-price">
                     <text class="unit"></text>
                     <text class="price">
-                      <text>{{parseFloat(s.num)}}份*¥{{parseFloat(s.price)}}</text>
+                      <text>{{s.num ? parseFloat(s.num) : 0}}份</text>
                     </text>
                   </text>
                 </view>
                 <view class="info-line">
                   <text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s)">打标签</text>
-                  <text class="item-count">¥{{ parseFloat(s.totalPrice)||0 }}</text>
+                  <text class="item-count">¥{{ s.price ? parseFloat(s.price) : 0 }}</text>
                 </view>
               </view>
             </view>
           </view>
         </view>
       </view>
-      <view v-if="detailInfo.remark !=''" class="content-box price-detail">
-        <div class="module-com input-line-wrap">
-          <tui-list-cell class="line-cell" :hover="false">
-            <div class="tui-title">备注</div>
-            <div>{{detailInfo.remark}}</div>
-          </tui-list-cell>
-        </div>
-      </view>
       <view class="content-box price-detail">
         <div class="module-com input-line-wrap">
           <tui-list-cell class="line-cell" :hover="false" v-if="Number(detailInfo.sendCost)>0">
@@ -266,8 +265,8 @@ export default {
             align-items: flex-end;
             .item-name {
               color: black;
-              font-size: 30upx;
-              font-weight: 700;
+              font-size:32upx;
+              font-weight:bold;
 							overflow: hidden;
 							white-space: nowrap;
 							text-overflow: ellipsis;
@@ -275,18 +274,18 @@ export default {
             }
             .item-price {
               color: #333;
-              font-size: 22upx;
+              font-size: 24upx;
               .price {
                 font-size: 25upx;
               }
             }
             .item-type {
               color: #999;
-              font-size: 24upx;
+              font-size:26upx;
             }
             .item-count {
               color: #666;
-              font-size: 24upx;
+              font-size: 26upx;
             }
           }
         }

hdApp/src/admin/goods/selectKind.vue

@@ -90,7 +90,8 @@ export default {
         this.getKindData();
     },
     getKindData() {
-      return getKindList({ search: "", type:this.tabIndex, page: this.list.page, name: this.seekVal, }).then((res) => {
+      let flower = this.option.flower ? this.option.flower : ''
+      return getKindList({ search: "", type:this.tabIndex, page: this.list.page, name: this.seekVal,flower:flower }).then((res) => {
           this.completes(res)
           if (this.$util.isEmpty(res.data)){
             return false

hdApp/src/admin/home/apply.vue

@@ -66,7 +66,7 @@ export default {
             { name: "员工业绩", img: `${this.$constant.imgUrl}/ghs/home/icon_ygyj.png`, url: "/admin/staff/achieve",pf:1},
             { name: "供货商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1},
             { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1},
-            { name: "报损", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
+            { name: "损耗", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
             { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1}
           ]
         },

hdApp/src/admin/home/workbench.vue

@@ -182,7 +182,7 @@ export default {
         { name: "制作记录", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "供货商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1 },
         { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1},
-        { name: "报损", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
+        { name: "损耗", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "花材采购", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1 },
         { name: "采购结账", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:1 },
         { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },

hdApp/src/mixins/cgPlantProduct.js

@@ -4,7 +4,7 @@ import { copyObject } from "@/utils/util";
 export default {
 	data() {
 		return {
-			selectJobType: "bill",//业务类型，开单、采购、报损、盘点
+			selectJobType: "bill",//业务类型，开单、采购、损耗、盘点
 			selectJobId:0,//业务类型对应的主体ID等
 			isCut:false,
 			productInfoList: [], //商品信息

hdApp/src/mixins/product.js

@@ -4,7 +4,7 @@ import { copyObject } from "@/utils/util";
 export default {
 	data() {
 		return {
-			selectJobType: "bill",//业务类型，开单、采购、报损、盘点
+			selectJobType: "bill",//业务类型，开单、采购、损耗、盘点
 			selectJobId:0,//业务类型对应的主体ID等
 			isCut:false,
 			productInfoList: [], //商品信息

hdApp/src/pages.json

@@ -38,7 +38,7 @@
 		{
 			"root": "admin/breakage",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "报损记录","enablePullDownRefresh": true}},
+				{"path": "list","style": {"navigationBarTitleText": "损耗记录","enablePullDownRefresh": true}},
 				{"path": "info","style": {"navigationBarTitleText": "详情"}},
 				{"path": "index","style": {"navigationBarTitleText": "选择花材"}},
 				{"path": "confirm","style": {"navigationBarTitleText": "确认订单"}},

hdApp/src/store/modules/product.js

@@ -17,7 +17,7 @@ export default {
 			commit("SET_SELECTINFO_BY_TYPE", { type, info: [] });
 		},
 
-		//重要！！！！selectJobType区分不同业务，如开单、报损、调拨，selectJobId用于区分相同业务下的不同主体，如调拨给不同门店，开店给不同的客户
+		//重要！！！！selectJobType区分不同业务，如开单、损耗、调拨，selectJobId用于区分相同业务下的不同主体，如调拨给不同门店，开店给不同的客户
 
 		//保存已选花材列表（新写法）
 		setSelectInfo({ commit }, { selectJobType, info,selectJobId }) {