采购优化

ghsApp/dist/build/mp-weixin/admin/clear/customOrderItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/app.json

@@ -357,6 +357,5 @@
     "t-tr": "/components/plugin/t-table/t-tr",
     "t-th": "/components/plugin/t-table/t-th",
     "t-td": "/components/plugin/t-table/t-td"
-  },
-  "sitemapLocation": "sitemap.json"
+  }
 }

ghsApp/dist/build/mp-weixin/components/app-date-picker.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/app-supplier-sel.json

@@ -1,8 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "bottom-popup": "/components/plugin/bottom-popup",
-    "app-close": "/components/module/app-close",
-    "app-search-module": "/components/module/app-search"
-  }
-}

ghsApp/dist/build/mp-weixin/components/app-supplier-sel.wxml

@@ -1 +0,0 @@
-<view class="app-area-sel _div data-v-68914cb6"><bottom-popup class="popup-wrap data-v-68914cb6" vue-id="52ae1546-1" show="{{showPopup}}" data-event-opts="{{[['^close',[['hidePopup']]]]}}" bind:close="__e" bind:__l="__l" vue-slots="{{['default']}}"><view class="map-wrap _div data-v-68914cb6"><view class="map-top-tit-wrap _div data-v-68914cb6"><view class="map-top-tit _div data-v-68914cb6">请选择供应商</view><app-close vue-id="{{('52ae1546-2')+','+('52ae1546-1')}}" icon="iconguanbi" data-event-opts="{{[['^close',[['hidePopup']]]]}}" bind:close="__e" class="data-v-68914cb6" bind:__l="__l"></app-close></view><view class="map-search _div data-v-68914cb6"><app-search-module vue-id="{{('52ae1546-3')+','+('52ae1546-1')}}" placeholder="请输入关键字" focus="{{false}}" data-ref="aaaaa" data-event-opts="{{[['^input',[['searchFn']]]]}}" bind:input="__e" class="data-v-68914cb6 vue-ref" bind:__l="__l"></app-search-module></view><scroll-view class="customer-list data-v-68914cb6" scroll-y="{{true}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['switchCustomer',['$0',index],[[['customerListData','',index]]]]]]]}}" class="customer-item data-v-68914cb6" bindtap="__e"><view class="item-avatar data-v-68914cb6"><image src="{{item.$orig.avatar}}" alt class="data-v-68914cb6"></image></view><view class="item-name data-v-68914cb6">{{''+(item.$orig.name||"")+''}}<block wx:if="{{newGhsId==item.$orig.id}}"><text class="data-v-68914cb6">新增</text></block></view><view class="item-level data-v-68914cb6">{{item.m0}}</view></view></block></scroll-view><view data-event-opts="{{[['tap',[['gotoAddCustomer',['$event']]]]]}}" class="add-customer-bar data-v-68914cb6" bindtap="__e">没有找到供应商？新增</view></view></bottom-popup></view>

ghsApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/fab.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesGys/detailsItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesPurchase/common/vendor.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/common/vendor"],{a075:function(e,r,t){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.createPurchaseOrderApi=r.getPurchaseListApi=r.getPurchaseDetailApi=void 0;var n=a(t("4838")),u=a(t("14bf"));function a(e){return e&&e.__esModule?e:{default:e}}function c(e,r,t,n,u,a,c){try{var i=e[a](c),o=i.value}catch(s){return void t(s)}i.done?r(o):Promise.resolve(o).then(n,u)}function i(e){return function(){var r=this,t=arguments;return new Promise((function(n,u){var a=e.apply(r,t);function i(e){c(a,n,u,i,o,"next",e)}function o(e){c(a,n,u,i,o,"throw",e)}i(void 0)}))}}var o=function(){var e=i(n.default.mark((function e(r){return n.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.abrupt("return",u.default.get("/purchase-order/detail",{orderSn:r}));case 1:case"end":return e.stop()}}),e)})));return function(r){return e.apply(this,arguments)}}();r.getPurchaseDetailApi=o;var s=function(){var e=i(n.default.mark((function e(r){return n.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.abrupt("return",u.default.get("/purchase-order/list",r));case 1:case"end":return e.stop()}}),e)})));return function(r){return e.apply(this,arguments)}}();r.getPurchaseListApi=s;var p=function(){var e=i(n.default.mark((function e(r){return n.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.abrupt("return",u.default.post("/purchase-order/create-order",r));case 1:case"end":return e.stop()}}),e)})));return function(r){return e.apply(this,arguments)}}();r.createPurchaseOrderApi=p}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/common/vendor"],{a075:function(e,r,t){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.updateRemark=r.createPurchaseOrderApi=r.getPurchaseListApi=r.getPurchaseDetailApi=void 0;var n=a(t("4838")),u=a(t("14bf"));function a(e){return e&&e.__esModule?e:{default:e}}function c(e,r,t,n,u,a,c){try{var i=e[a](c),o=i.value}catch(s){return void t(s)}i.done?r(o):Promise.resolve(o).then(n,u)}function i(e){return function(){var r=this,t=arguments;return new Promise((function(n,u){var a=e.apply(r,t);function i(e){c(a,n,u,i,o,"next",e)}function o(e){c(a,n,u,i,o,"throw",e)}i(void 0)}))}}var o=function(){var e=i(n.default.mark((function e(r){return n.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.abrupt("return",u.default.get("/purchase-order/detail",{orderSn:r}));case 1:case"end":return e.stop()}}),e)})));return function(r){return e.apply(this,arguments)}}();r.getPurchaseDetailApi=o;var s=function(){var e=i(n.default.mark((function e(r){return n.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.abrupt("return",u.default.get("/purchase-order/list",r));case 1:case"end":return e.stop()}}),e)})));return function(r){return e.apply(this,arguments)}}();r.getPurchaseListApi=s;var p=function(){var e=i(n.default.mark((function e(r){return n.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.abrupt("return",u.default.post("/purchase-order/create-order",r));case 1:case"end":return e.stop()}}),e)})));return function(r){return e.apply(this,arguments)}}();r.createPurchaseOrderApi=p;var f=function(){var e=i(n.default.mark((function e(r){return n.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.abrupt("return",u.default.post("/purchase-order/update-remark",r));case 1:case"end":return e.stop()}}),e)})));return function(r){return e.apply(this,arguments)}}();r.updateRemark=f}}]);

ghsApp/dist/build/mp-weixin/pagesPurchase/components/pageSuccess.wxml

@@ -1 +1 @@
-<app-result vue-id="2540701a-1" title="{{title?title:'成功'}}" class="data-v-3440170a" bind:__l="__l" vue-slots="{{['default']}}"><view class="flowers-list-box data-v-3440170a"><view class="flex title data-v-3440170a">以下花材售价已变更，如需要请修改：</view><block wx:for="{{flowersList}}" wx:for-item="res" wx:for-index="i" wx:key="i"><view class="flex-space flowers-list data-v-3440170a"><view class="ov-1x flowers-name data-v-3440170a">{{res.name}}</view><view class="flex flowers-val data-v-3440170a"><input type="digit" data-event-opts="{{[['focus',[['priceFocus',[i]]]],['input',[['__set_model',['$0','price','$event',[]],[[['flowersList','',i]]]]]]]}}" value="{{res.price}}" bindfocus="__e" bindinput="__e" class="data-v-3440170a"/>元</view><view data-event-opts="{{[['tap',[['changePriceFun',['$0','$1'],[[['flowersList','',i,'id']],[['flowersList','',i,'price']]]]]]]}}" class="flex-center 	flowers-btn data-v-3440170a" bindtap="__e">修改</view></view></block></view><navigator class="flex-center goHome data-v-3440170a" open-type="switchTab" url="/admin/home/workbench">返回首页</navigator></app-result>
+<app-result vue-id="2540701a-1" title="{{title?title:'成功'}}" class="data-v-503fa7ba" bind:__l="__l" vue-slots="{{['default']}}"><view class="flowers-list-box data-v-503fa7ba"><view class="flex title data-v-503fa7ba">以下花材售价已变更，如需要请修改：</view><block wx:for="{{flowersList}}" wx:for-item="res" wx:for-index="i" wx:key="i"><view class="flex-space flowers-list data-v-503fa7ba"><view class="ov-1x flowers-name data-v-503fa7ba">{{res.name}}</view><view class="flex flowers-val data-v-503fa7ba"><input type="digit" data-event-opts="{{[['focus',[['priceFocus',[i]]]],['input',[['__set_model',['$0','price','$event',[]],[[['flowersList','',i]]]]]]]}}" value="{{res.price}}" bindfocus="__e" bindinput="__e" class="data-v-503fa7ba"/>元</view><view data-event-opts="{{[['tap',[['changePriceFun',['$0','$1'],[[['flowersList','',i,'id']],[['flowersList','',i,'price']]]]]]]}}" class="flex-center 	flowers-btn data-v-503fa7ba" bindtap="__e">修改</view></view></block></view><button data-event-opts="{{[['tap',[['goBack',['$event']]]]]}}" class="admin-button-com big data-v-503fa7ba" style="margin-top:150rpx;" bindtap="__e">返回列表</button></app-result>

ghsApp/dist/build/mp-weixin/pagesPurchase/components/pageSuccess.wxss

@@ -1 +1 @@
-.admin-button-com.data-v-3440170a{margin-bottom:20rpx;width:100%}.flowers-list-box.data-v-3440170a{width:100%}.flowers-list-box .title.data-v-3440170a{height:80rpx;border-top:1rpx solid #dcdcdc;font-size:28rpx;font-weight:700}.flowers-list-box .flowers-list.data-v-3440170a{padding:15rpx 0}.flowers-list-box .flowers-list .flowers-name.data-v-3440170a{width:150rpx}.flowers-list-box .flowers-list .flowers-val input.data-v-3440170a{width:160rpx;height:50rpx;padding:0 20rpx;margin-right:20rpx;border:1rpx solid #d4d4d4;text-align:center}.flowers-list-box .flowers-list .flowers-btn.data-v-3440170a{width:100rpx;height:50rpx;color:#fff;background:#69f;border-radius:10rpx}.goHome.data-v-3440170a{width:80%;height:80rpx;color:#fff;margin-top:150rpx;background:#69f;border-radius:10rpx}
+.admin-button-com.data-v-503fa7ba{margin-bottom:20rpx;width:100%}.flowers-list-box.data-v-503fa7ba{width:100%}.flowers-list-box .title.data-v-503fa7ba{height:80rpx;border-top:1rpx solid #dcdcdc;font-size:28rpx;font-weight:700}.flowers-list-box .flowers-list.data-v-503fa7ba{padding:15rpx 0}.flowers-list-box .flowers-list .flowers-name.data-v-503fa7ba{width:150rpx}.flowers-list-box .flowers-list .flowers-val input.data-v-503fa7ba{width:160rpx;height:50rpx;padding:0 20rpx;margin-right:20rpx;border:1rpx solid #d4d4d4;text-align:center}.flowers-list-box .flowers-list .flowers-btn.data-v-503fa7ba{width:100rpx;height:50rpx;color:#fff;background:#69f;border-radius:10rpx}.goHome.data-v-503fa7ba{width:80%;height:80rpx;color:#fff;margin-top:150rpx;background:#69f;border-radius:10rpx}

ghsApp/dist/build/mp-weixin/pagesPurchase/details.json

@@ -4,7 +4,6 @@
     "tui-list-cell": "/components/plugin/list-cell",
     "app-avatar-module": "/components/module/app-avatar",
     "app-customer-sel": "/components/app-customer-sel",
-    "app-date-picker": "/components/app-date-picker",
-    "app-supplier-sel": "/components/app-supplier-sel"
+    "app-date-picker": "/components/app-date-picker"
   }
 }

ghsApp/dist/build/mp-weixin/pagesPurchase/order.wxml

@@ -1 +1 @@
-<view class="order-page data-v-6d69aea2"><view class="order-list data-v-6d69aea2" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-6d69aea2"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><order-item vue-id="{{'74ac7040-1-'+index}}" info="{{item}}" data-event-opts="{{[['^click',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" bind:click="__e" class="data-v-6d69aea2" bind:__l="__l"></order-item></block></block></block><block wx:else><block class="data-v-6d69aea2"><app-wrapper-empty vue-id="74ac7040-2" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-6d69aea2" bind:__l="__l"></app-wrapper-empty></block></block></view><view class="app-footer open_btn data-v-6d69aea2"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-6d69aea2" bindtap="__e">新增采购</view></view></view>
+<view class="order-page data-v-4e70e181"><view class="order-list data-v-4e70e181" scroll-y="{{true}}"><block wx:if="{{!$root.g0}}"><block class="data-v-4e70e181"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><order-item vue-id="{{'74ac7040-1-'+index}}" info="{{item}}" data-event-opts="{{[['^click',[['gotoDetails',['$0'],[[['list.data','',index]]]]]]]}}" bind:click="__e" class="data-v-4e70e181" bind:__l="__l"></order-item></block></block></block><block wx:else><block class="data-v-4e70e181"><app-wrapper-empty vue-id="74ac7040-2" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-4e70e181" bind:__l="__l"></app-wrapper-empty></block></block></view><view class="app-footer open_btn data-v-4e70e181"><view data-event-opts="{{[['tap',[['addEvent',['$event']]]]]}}" class="admin-button-com middle blue data-v-4e70e181" bindtap="__e">新增采购</view></view></view>

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.js

@@ -1,4 +1,4 @@
-require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/orderItem"],{"0be8":function(t,e,n){"use strict";var a=n("fa16"),r=n.n(a);r.a},"19e3":function(t,e,n){"use strict";n.r(e);var a=n("a3d5"),r=n.n(a);for(var u in a)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(u);e["default"]=r.a},"1a53":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]},"8ab3":function(t,e,n){"use strict";n.r(e);var a=n("1a53"),r=n("19e3");for(var u in r)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(u);n("0be8");var c,i=n("0095"),f=Object(i["a"])(r["default"],a["b"],a["c"],!1,null,"6f7cff12",null,!1,a["a"],c);e["default"]=f.exports},a3d5:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=n("7602"),r={props:{info:{required:!0}},data:function(){return{PURCHASE_ORDER_STATUS:a.PURCHASE_ORDER_STATUS}},computed:{getStatusName:function(){var t="";switch(this.info.status){case a.PURCHASE_ORDER_STATUS.CONFIRM:t="待确认";break;case a.PURCHASE_ORDER_STATUS.UNDIS:t="待配送";break;case a.PURCHASE_ORDER_STATUS.DIS:t="配送中";break;case a.PURCHASE_ORDER_STATUS.DONE:t="已完成";break;default:break}return t}},methods:{clickItemEvent:function(){this.$emit("click",this.info)}}};e.default=r},fa16:function(t,e,n){}}]);
+require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/orderItem"],{"19e3":function(t,e,n){"use strict";n.r(e);var a=n("a3d5"),r=n.n(a);for(var u in a)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(u);e["default"]=r.a},"6c4a":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]},"769b":function(t,e,n){},"8ab3":function(t,e,n){"use strict";n.r(e);var a=n("6c4a"),r=n("19e3");for(var u in r)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(u);n("f15e");var c,i=n("0095"),f=Object(i["a"])(r["default"],a["b"],a["c"],!1,null,"f52245a2",null,!1,a["a"],c);e["default"]=f.exports},a3d5:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=n("7602"),r={props:{info:{required:!0}},data:function(){return{PURCHASE_ORDER_STATUS:a.PURCHASE_ORDER_STATUS}},computed:{getStatusName:function(){var t="";switch(this.info.status){case a.PURCHASE_ORDER_STATUS.CONFIRM:t="待确认";break;case a.PURCHASE_ORDER_STATUS.UNDIS:t="待配送";break;case a.PURCHASE_ORDER_STATUS.DIS:t="配送中";break;case a.PURCHASE_ORDER_STATUS.DONE:t="已完成";break;default:break}return t}},methods:{clickItemEvent:function(){this.$emit("click",this.info)}}};e.default=r},f15e:function(t,e,n){"use strict";var a=n("769b"),r=n.n(a);r.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pagesPurchase/orderItem-create-component',
     {

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.wxml

@@ -1 +1 @@
-<view data-event-opts="{{[['tap',[['clickItemEvent',['$event']]]]]}}" class="order-item-view data-v-6f7cff12" bindtap="__e"><view class="item-header data-v-6f7cff12"><view class="title data-v-6f7cff12"><image class="icon data-v-6f7cff12" src="{{info.avatar}}" alt="商品图"></image><text class="name data-v-6f7cff12">{{''+info.nickName+''}}</text></view><view class="status data-v-6f7cff12">{{getStatusName+''}}</view></view><view class="item-main data-v-6f7cff12"><view class="item-info data-v-6f7cff12"><view class="info-row data-v-6f7cff12"><text class="info-label data-v-6f7cff12">日期:</text><text class="info-value data-v-6f7cff12">{{info.addTime+''}}</text></view><view class="info-row data-v-6f7cff12"><text class="info-label data-v-6f7cff12">单号:</text><text class="info-value data-v-6f7cff12">{{info.orderSn+''}}</text></view><view class="info-row data-v-6f7cff12"><text class="info-label data-v-6f7cff12">人员:</text><text class="info-value data-v-6f7cff12">{{info.adminName+''}}</text></view></view><view class="item-price data-v-6f7cff12">{{"¥"+info.realPrice+''}}<text class="iconfont iconxiangyou data-v-6f7cff12"></text></view></view></view>
+<view data-event-opts="{{[['tap',[['clickItemEvent',['$event']]]]]}}" class="order-item-view data-v-f52245a2" bindtap="__e"><view class="item-header data-v-f52245a2"><view class="title data-v-f52245a2"><image class="icon data-v-f52245a2" src="{{info.avatar}}" alt="商品图"></image><text class="name data-v-f52245a2">{{''+info.nickName+''}}</text></view><view class="status data-v-f52245a2">{{getStatusName+''}}</view></view><view class="item-main data-v-f52245a2"><view class="item-info data-v-f52245a2"><view class="info-row data-v-f52245a2"><text class="info-label data-v-f52245a2">日期：</text><text class="info-value data-v-f52245a2">{{info.addTime+''}}</text></view><view class="info-row data-v-f52245a2"><text class="info-label data-v-f52245a2">单号：</text><text class="info-value data-v-f52245a2">{{info.orderSn+''}}</text></view><view class="info-row data-v-f52245a2"><text class="info-label data-v-f52245a2">人员：</text><text class="info-value data-v-f52245a2">{{info.adminName+''}}</text></view><view class="info-row data-v-f52245a2"><text class="info-label data-v-f52245a2">备注：</text><text class="info-value data-v-f52245a2">{{info.remark+''}}</text></view></view><view class="item-price data-v-f52245a2">{{"¥"+info.realPrice+''}}<text class="iconfont iconxiangyou data-v-f52245a2"></text></view></view></view>

ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.wxss

@@ -1 +1 @@
-.order-item-view.data-v-6f7cff12{padding:30rpx;margin-bottom:20rpx;width:100%;background-color:#fff}.order-item-view .item-header.data-v-6f7cff12{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin-bottom:20rpx}.order-item-view .item-header .title.data-v-6f7cff12{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-flex:1;-webkit-flex:1;flex:1}.order-item-view .item-header .title .icon.data-v-6f7cff12{margin-right:20rpx;width:50rpx;height:50rpx;border-radius:25rpx;border-radius:50%}.order-item-view .item-header .title .name.data-v-6f7cff12{font-size:32rpx;font-weight:600;color:#333}.order-item-view .item-header .status.data-v-6f7cff12{-webkit-flex-shrink:0;flex-shrink:0;color:#3385ff}.order-item-view .item-main.data-v-6f7cff12{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;align-items:flex-end}.order-item-view .item-main .item-info.data-v-6f7cff12{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:26rpx}.order-item-view .item-main .item-info .info-row.data-v-6f7cff12{margin-top:12rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-item-view .item-main .item-info .info-label.data-v-6f7cff12{font-weight:400;color:#999}.order-item-view .item-main .item-info .info-value.data-v-6f7cff12{font-weight:400;color:#333}.order-item-view .item-main .item-price.data-v-6f7cff12{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-shrink:0;flex-shrink:0;font-size:30rpx;font-weight:600;color:#333}.order-item-view .item-main .item-price .iconfont.data-v-6f7cff12{font-size:28rpx;color:#999}
+.order-item-view.data-v-f52245a2{padding:30rpx;margin-bottom:20rpx;width:100%;background-color:#fff}.order-item-view .item-header.data-v-f52245a2{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin-bottom:20rpx}.order-item-view .item-header .title.data-v-f52245a2{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-flex:1;-webkit-flex:1;flex:1}.order-item-view .item-header .title .icon.data-v-f52245a2{margin-right:20rpx;width:50rpx;height:50rpx;border-radius:25rpx;border-radius:50%}.order-item-view .item-header .title .name.data-v-f52245a2{font-size:32rpx;font-weight:600;color:#333}.order-item-view .item-header .status.data-v-f52245a2{-webkit-flex-shrink:0;flex-shrink:0;color:#3385ff}.order-item-view .item-main.data-v-f52245a2{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;align-items:flex-end}.order-item-view .item-main .item-info.data-v-f52245a2{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:26rpx}.order-item-view .item-main .item-info .info-row.data-v-f52245a2{margin-top:12rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-item-view .item-main .item-info .info-label.data-v-f52245a2{font-weight:400;color:#999}.order-item-view .item-main .item-info .info-value.data-v-f52245a2{font-weight:400;color:#333}.order-item-view .item-main .item-price.data-v-f52245a2{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-shrink:0;flex-shrink:0;font-size:30rpx;font-weight:600;color:#333}.order-item-view .item-main .item-price .iconfont.data-v-f52245a2{font-size:28rpx;color:#999}

ghsApp/dist/build/mp-weixin/pagesPurchase/supplier.wxml

@@ -1 +1 @@
-<view class="order-page data-v-5ec3e6c9"><scroll-view class="order_list data-v-5ec3e6c9" scroll-y="{{true}}" scroll-view="{{true}}"><block class="data-v-5ec3e6c9"><block wx:if="{{!$root.g0}}"><block class="data-v-5ec3e6c9"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$event']]]]]}}" class="list_item data-v-5ec3e6c9" bindtap="__e"><image src="{{item.$orig.avatar}}" class="data-v-5ec3e6c9"></image><view class="store_name data-v-5ec3e6c9"><view class="store_title data-v-5ec3e6c9">{{item.$orig.name}}</view><view class="accumulative data-v-5ec3e6c9">{{"欠款: "+item.$orig.debtAmount}}</view></view><view class="store_btn data-v-5ec3e6c9"><view data-event-opts="{{[['tap',[['gotoDetails',['$event']]]]]}}" class="btn_entrance data-v-5ec3e6c9" catchtap="__e">采购</view><block wx:if="{{item.m0>0}}"><view data-event-opts="{{[['tap',[['gotoDetailsEvent',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-5ec3e6c9" catchtap="__e">结账</view></block><block wx:else><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="btn_entrance btn_forbid data-v-5ec3e6c9" catchtap="__e">结账</view></block><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/clear/list'],['query',{ghsId:item.$orig.id}]]]]]]]}}" class="btn_entrance data-v-5ec3e6c9" catchtap="__e">账单</view></view></view></block></block></block><block wx:else><block class="data-v-5ec3e6c9"><app-wrapper-empty vue-id="6b4875c2-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-5ec3e6c9" bind:__l="__l"></app-wrapper-empty></block></block></block></scroll-view><view class="app-footer _div data-v-5ec3e6c9"><view data-event-opts="{{[['tap',[['add',['$event']]]]]}}" class="admin-button-com middle blue _div data-v-5ec3e6c9" bindtap="__e">添加</view></view></view>
+<view class="order-page data-v-53493d2c"><scroll-view class="order_list data-v-53493d2c" scroll-y="{{true}}" scroll-view="{{true}}"><block class="data-v-53493d2c"><block wx:if="{{!$root.g0}}"><block class="data-v-53493d2c"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['gotoDetails',['$event']]]]]}}" class="list_item data-v-53493d2c" bindtap="__e"><image src="{{item.$orig.avatar}}" class="data-v-53493d2c"></image><view class="store_name data-v-53493d2c"><view class="store_title data-v-53493d2c">{{item.$orig.name}}</view><view class="accumulative data-v-53493d2c">{{"欠款: "+item.$orig.debtAmount}}</view></view><view class="store_btn data-v-53493d2c"><view data-event-opts="{{[['tap',[['gotoDetails',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-53493d2c" catchtap="__e">采购</view><block wx:if="{{item.m0>0}}"><view data-event-opts="{{[['tap',[['gotoDetailsEvent',['$0'],[[['supplierList','',index]]]]]]]}}" class="btn_entrance data-v-53493d2c" catchtap="__e">结账</view></block><block wx:else><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="btn_entrance btn_forbid data-v-53493d2c" catchtap="__e">结账</view></block><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/clear/list'],['query',{ghsId:item.$orig.id}]]]]]]]}}" class="btn_entrance data-v-53493d2c" catchtap="__e">账单</view></view></view></block></block></block><block wx:else><block class="data-v-53493d2c"><app-wrapper-empty vue-id="6b4875c2-1" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-53493d2c" bind:__l="__l"></app-wrapper-empty></block></block></block></scroll-view><view class="app-footer _div data-v-53493d2c"><view data-event-opts="{{[['tap',[['add',['$event']]]]]}}" class="admin-button-com middle blue _div data-v-53493d2c" bindtap="__e">添加</view></view></view>

ghsApp/dist/build/mp-weixin/pagesPurchase/supplier.wxss

@@ -1 +1 @@
-.order-page .order_list.data-v-5ec3e6c9{height:100%;background:#f0f2f6;padding:0 0 120rpx}.order-page .order_list .list_item.data-v-5ec3e6c9{margin:20rpx 0 0;position:relative;height:180rpx;width:100vw;background:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-page .order_list .list_item > image.data-v-5ec3e6c9{margin-left:30rpx;width:120rpx;height:120rpx;border-radius:60rpx}.order-page .order_list .list_item > .store_name.data-v-5ec3e6c9{margin-left:30rpx;width:280rpx;display:block}.order-page .order_list .list_item > .store_name > .store_title.data-v-5ec3e6c9{margin-bottom:30rpx;width:200rpx;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;font-size:32rpx;font-weight:700;color:#333}.order-page .order_list .list_item > .store_name > .accumulative.data-v-5ec3e6c9{font-size:26rpx;color:#999}.order-page .order_list .list_item > .store_btn.data-v-5ec3e6c9{position:absolute;right:20rpx}.order-page .order_list .list_item > .store_btn > .btn_entrance.data-v-5ec3e6c9{display:inline-block;font-size:28rpx;color:#3385ff;border:1rpx solid #3385ff;border-radius:28rpx;padding:10rpx 20rpx;margin-left:20rpx}.order-page .order_list .list_item > .store_btn > .btn_forbid.data-v-5ec3e6c9{border:1rpx solid #999;color:#999}.order-page .pay_list.data-v-5ec3e6c9{padding-top:20rpx;background-color:#f0f2f6}.order-page .app-footer.data-v-5ec3e6c9{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.order-page .app-footer .admin-button-com.data-v-5ec3e6c9{width:180rpx;margin-right:30rpx}
+.order-page .order_list.data-v-53493d2c{height:100%;background:#f0f2f6;padding:0 0 120rpx}.order-page .order_list .list_item.data-v-53493d2c{margin:20rpx 0 0;position:relative;height:180rpx;width:100vw;background:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.order-page .order_list .list_item > image.data-v-53493d2c{margin-left:30rpx;width:120rpx;height:120rpx;border-radius:60rpx}.order-page .order_list .list_item > .store_name.data-v-53493d2c{margin-left:30rpx;width:280rpx;display:block}.order-page .order_list .list_item > .store_name > .store_title.data-v-53493d2c{margin-bottom:30rpx;width:200rpx;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;font-size:32rpx;font-weight:700;color:#333}.order-page .order_list .list_item > .store_name > .accumulative.data-v-53493d2c{font-size:26rpx;color:#999}.order-page .order_list .list_item > .store_btn.data-v-53493d2c{position:absolute;right:20rpx}.order-page .order_list .list_item > .store_btn > .btn_entrance.data-v-53493d2c{display:inline-block;font-size:28rpx;color:#3385ff;border:1rpx solid #3385ff;border-radius:28rpx;padding:10rpx 20rpx;margin-left:20rpx}.order-page .order_list .list_item > .store_btn > .btn_forbid.data-v-53493d2c{border:1rpx solid #999;color:#999}.order-page .pay_list.data-v-53493d2c{padding-top:20rpx;background-color:#f0f2f6}.order-page .app-footer.data-v-53493d2c{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.order-page .app-footer .admin-button-com.data-v-53493d2c{width:180rpx;margin-right:30rpx}

ghsApp/dist/build/mp-weixin/project.config.json

@@ -5,54 +5,27 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "es6": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wxcf32b3f0684c2433",
-  "projectname": "%E4%BE%9B%E5%BA%94%E5%95%86",
+  "projectname": "供应商",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }

ghsApp/dist/build/mp-weixin/sitemap.json

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}

ghsApp/src/api/purchase/index.js

@@ -20,3 +20,7 @@ export const getPurchaseListApi = async data => {
 export const createPurchaseOrderApi = async data => {
 	return https.post("/purchase-order/create-order", data);
 };
+
+export const updateRemark = async data => {
+	return https.post("/purchase-order/update-remark", data);
+};

ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
-    "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
-    "name":"花掌柜"
+    "account": 12358,
+    "apiHost": "https://api.shop.wixhb.com",
+    "socketApiHost": "api.shop.wixhb.com",
+    "imgHost": "https://img.wixhb.com",
+    "name":"销花宝"
   }
 }

ghsApp/src/manifest.json

@@ -83,15 +83,21 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+		"optimization" : {
+			"subPackages" : true
+		},
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
+        },
+        "optimization": {  
+            "subPackages": true  
         }
     },
     "mp-alipay" : {

ghsApp/src/pagesPurchase/add.vue

@@ -304,9 +304,8 @@ export default {
 				console.log('过滤后',list)
 				this.setSelectInfoByType({ type: this.pageType, info: list });
 
-
 				uni.navigateTo({
-					url: "/pagesPurchase/details"
+					url: "/pagesPurchase/details?ghsId="+this.option.ghsId+"&ghsName="+this.option.ghsName
 				});
 				this.cancelEvent();
 			}

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -44,22 +44,22 @@
 </style>
 <template>
   <appResult :title="title?title:'成功'">
-			<view class="flowers-list-box">
-				<view class="flex title">以下花材售价已变更，如需要请修改：</view>
-				<view class="flex-space flowers-list" v-for="(res,i) in flowersList" :key="i">
-					<view class="ov-1x flowers-name">{{res.name}}</view>
-					<view class="flex flowers-val">
-						<input type="digit" v-model="res.price" @focus="priceFocus(i)"> 元
-					</view>
-					<view class="flex-center 	flowers-btn" @tap="changePriceFun(res.id,res.price)">修改</view>
-				</view>
+	<view class="flowers-list-box">
+		<view class="flex title">以下花材售价已变更，如需要请修改：</view>
+		<view class="flex-space flowers-list" v-for="(res,i) in flowersList" :key="i">
+			<view class="ov-1x flowers-name">{{res.name}}</view>
+			<view class="flex flowers-val">
+				<input type="digit" v-model="res.price" @focus="priceFocus(i)"> 元
 			</view>
-			<navigator open-type="switchTab" class="flex-center goHome" url="/admin/home/workbench">返回首页</navigator>
+			<view class="flex-center 	flowers-btn" @tap="changePriceFun(res.id,res.price)">修改</view>
+		</view>
+	</view>
+	<button class="admin-button-com big" @click="goBack" style="margin-top:150rpx;">返回列表</button>
   </appResult>
 </template>
 <script>
-	import { getAllProductDataApi } from "@/api/product/index";
-	import { changePriceByIdApi } from '@/api/product/index'
+import { getAllProductDataApi } from "@/api/product/index";
+import { changePriceByIdApi } from '@/api/product/index'
 import appResult from "@/components/app-result";
 export default {
   name: "pageSuccess",
@@ -84,38 +84,40 @@ export default {
 		uni.removeStorageSync('flowersItemInfo');
 		uni.navigateBack({delta:2})
 	},
-		methods: {
-			priceFocus(i){
-               this.flowersList[i].price = ''
-			},
-    closeLayer() {
-					uni.navigateBack({delta: 3});
-    },
-				getList(){
-    	let productIdArr = '';
-				this.flowersItemInfo.forEach((ele)=>{
-					productIdArr += ele.productId+','
+	methods: {
+		goBack() {
+			this.$util.pageTo({url: "/pagesPurchase/order",type:3});
+		},
+		priceFocus(i){
+			this.flowersList[i].price = ''
+		},
+		closeLayer() {
+			uni.navigateBack({delta: 3});
+		},
+		getList(){
+			let productIdArr = '';
+			this.flowersItemInfo.forEach((ele)=>{
+				productIdArr += ele.productId+','
+			})
+			getAllProductDataApi({ids : productIdArr.substring(0, productIdArr.lastIndexOf(',')),}).then((res)=>{
+					console.log(res)
+				this.flowersList = res.data.list;
+			});
+		},
+		changePriceFun(id,price){
+			if(price) {
+				changePriceByIdApi({
+					productId: id,
+					price: price
+				}).then(res => {
+						uni.showToast({title:'修改成功'})
 				})
-				getAllProductDataApi({ids : productIdArr.substring(0, productIdArr.lastIndexOf(',')),}).then((res)=>{
-						console.log(res)
-					this.flowersList = res.data.list;
-				});
-			},
-			changePriceFun(id,price){
-				if(price) {
-					changePriceByIdApi({
-						productId: id,
-						price: price
-					}).then(res => {
-							uni.showToast({title:'修改成功'})
-					})
-				} else {
-					this.$msg('金额不能为空')
-				}
-				
-			},
-
-  },
+			} else {
+				this.$msg('金额不能为空')
+			}
+			
+		},
+	},
 };
 </script>
 

ghsApp/src/pagesPurchase/details.vue

@@ -6,17 +6,8 @@
 				<view class="module-com">
 					<view class="commodity-view">
 						<view class="commodity-list">
-							<view
-								class="commodity-item"
-								v-for="(item, index) in selectList"
-								:key="index"
-							>
-								<image
-									class="item-icon"
-									:src="item.itemCover || item.cover"
-									alt="商品图"
-								/>
-
+							<view class="commodity-item" v-for="(item, index) in selectList" :key="index">
+								<image class="item-icon" :src="item.itemCover || item.cover" alt="商品图" />
 								<view class="item-info">
 									<view class="info-line">
 										<text class="item-name">{{ item.itemName }}</text>
@@ -29,7 +20,7 @@
 										</text>
 									</view>
 									<view class="info-line">
-										<text class="item-type">b级</text>
+										<text class="item-type"></text>
 										<text class="item-count">
 											<text >{{`${item.bigCount}`}}</text>
 											<text >/</text>
@@ -52,113 +43,93 @@
 						</view>
 					</view>
 				</view>
-				<!-- <view class="prompt-text">注: 请先关注公众号，绑定后可以在移动端自动登录</view> -->
-
 				<view class="module-com input-line-wrap">
-					<tui-list-cell class="line-cell" :hover="false" :arrow="true" @tap="showCustomer = true">
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title ">供应商</view>
-						<text :style="!supplier.name?'color:#cccccc':''">
-							{{ supplier.name || "请选择" }}
-						</text>
-					</tui-list-cell>
-					<!-- <tui-list-cell class="line-cell" :hover="false">
-						<view class="tui-title "></view>
-
-						<view class="tag-list">
-							<view class="tag-item">
-								盛丰
-							</view>
-							<view class="tag-item">
-								盛丰
-							</view>
-							<view class="tag-item">
-								盛丰
-							</view>
-						</view>
-					</tui-list-cell> -->
-				</view>
-				<view class="module-com input-line-wrap">
-
-					<tui-list-cell class="line-cell" :hover="false">
-						<view class="tui-title ">包装重量</view>
-						<input type="digit" :disabled="!canIEdit" v-model="form.packWeight" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="公斤"/>
+						<text>{{ option.ghsName }}</text>
 					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false">
-						<view class="tui-title ">总重量</view>
-						<view>{{totalWeight}}</view>
+					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+						<view class="tui-title ">入库日期</view>
+						<AppDatePicker v-if="canIEdit" :dateVal="form.entryTime" :placeholder="'请选择日期'"/>
+						<view v-else>{{ form.entryTime || "请选择日期" }}</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">打包费</view>
-						<input type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.packingCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写，留空没有费用"/>
+						<input type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.packingCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
+
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+						<view class="tui-title">运费支付</view>
+						<button @click="changeYfPayWay(1)" class="admin-button-com mini-btn" :class="form.yfPayWay == 1 ? 'blue' : 'default'">寄付</button>
+						<button @click="changeYfPayWay(2)" class="admin-button-com mini-btn" :class="form.yfPayWay == 2 ? 'blue' : 'default'" style="margin-left:20rpx;">到付</button>
+					</tui-list-cell>
+				</view>
+
+				<view class="module-com input-line-wrap">
+
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">短途运费</view>
-						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.shortCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写，留空没有费用"/>
+						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.shortCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">长途运费</view>
-						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.longCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写，留空没有费用"/>
+						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.longCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
+
+				</view>
+
+				<view class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">提货费</view>
-						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.pickCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写，留空没有费用"/>
+						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.pickCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">本地运费</view>
-						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.localCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写，留空没有费用"/>
-					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title ">入库日期</view>
-						<AppDatePicker v-if="canIEdit" :dateVal="form.entryTime" :placeholder="'请选择日期'"/>
-						<view v-else>{{ form.entryTime || "请选择日期" }}</view>
+						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.localCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
+				</view>
 
+				<view class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">总金额</view>
 						<view>{{totalPrice}}</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
-						<view class="tui-title ">实付金额</view>
-						<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);height:70rpx;"  type="digit" :disabled="!canIEdit"  @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写，留空没有费用"/>
+						<view class="tui-title ">应付金额</view>
+						<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);height:70rpx;"  type="digit" :disabled="!canIEdit"  @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
-						<view class="tui-title ">报损减免</view>
+						<view class="tui-title ">减免</view>
 						<view>{{(totalPrice - modifyPrice).toFixed(2) }}</view>
 					</tui-list-cell>
-
-					<tui-list-cell class="line-cell remark-wrap" :hover="false">
+					<tui-list-cell class="line-cell" :hover="false">
+						<view class="tui-title ">总运费</view>
+						<view>{{totalFreight}}</view>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<view class="tui-title ">每公斤运费</view>
+						<view>{{perKgFreight}}</view>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title">备注</view>
 						<view class="tui-input">
-							<textarea
-								:disabled="!canIEdit"
-								v-model="form.introduction"
-								class="tui-textarea remark"
-								placeholder-class="phcolor"
-								placeholder="请输入备注"
-							/>
+							<input type="text" v-model="form.remark" placeholder-class="phcolor" style="width:430rpx;" class="tui-input" placeholder="这里写备注"/>
 						</view>
 					</tui-list-cell>
 				</view>
+
 			</form>
 		</view>
 		<view class="under-bar">
 			<view class="price-view">
-				<text class="price-title">实付金额</text>
+				<text class="price-title">应付金额</text>
 				<text class="price-number">
-					<!--¥ <text class="large">{{ Number(allPrice) + Number(form.packingCharge) + Number(form.shortCharge) + Number(form.longCharge) + Number(form.pickCharge) + Number(form.localCharge) }}</text>-->
 					¥ <text class="large">{{ modifyPrice }}</text>
 				</text>
 			</view>
-			<button class="admin-button-com blue middle" v-if="canIEdit" @click="formSubmit">
-				确认
-			</button>
+			<button class="admin-button-com blue middle" v-if="canIEdit" @click="formSubmit">确认</button>
 		</view>
 
-		<!-- 选择客户 -->
-		<AppSupplierSel
-			:show.sync="showCustomer"
-			@change="changeCustomerFn"
-		/>
 	</view>
 </template>
 
@@ -169,14 +140,9 @@ import AppAvatarModule from "@/components/module/app-avatar";
 import AppCustomerSel from "@/components/app-customer-sel";
 const form = require("@/utils/formValidation.js");
 import productMins from "@/mixins/product";
-import {
-	getPurchaseDetailApi,
-	createPurchaseOrderApi
-} from "@/api/purchase/index";
+import {getPurchaseDetailApi,createPurchaseOrderApi} from "@/api/purchase/index";
 import { PURCHASE_ORDER_STATUS } from "@/utils/declare";
-
 import AppDatePicker from "@/components/app-date-picker";
-import AppSupplierSel from "@/components/app-supplier-sel";
 
 export default {
 	// 采购详情
@@ -184,8 +150,7 @@ export default {
 		TuiListCell,
 		AppAvatarModule,
 		AppCustomerSel,
-		AppDatePicker,
-		AppSupplierSel
+		AppDatePicker
 	},
 	mixins: [productMins],
 	data() {
@@ -195,23 +160,26 @@ export default {
 			pageType: "purchase",
 			supplier:'',
 			form: {
-				packingCharge: "", //打包费
+				packingCharge: "",
 				shortCharge: "",
 				longCharge: "",
 				pickCharge: "",
 				localCharge: "",
-				packWeight: "",
-
 				entryTime: "",
-				ghsId: null
+				ghsId: null,
+				yfPayWay:1,
+				remark:"",
 			},
 			showCustomer: false,
 			detailsInfo: {},
 			totalPrice:0,
-			modifyPrice:0
+			modifyPrice:0,
+			totalFreight:0,
+			perKgFreight:0,
 		};
 	},
-	onLoad() {
+	onLoad(option) {
+		this.form.ghsId = option.ghsId
 		this.initData();
 	},
 	onShow(){
@@ -253,13 +221,6 @@ export default {
 			let calcWeight = realityWeight.toFixed(2);
 			return calcWeight
 		},
-		totalWeight(){
-			let totalWeight = this.selectAllRealityWeight
-			if(Number(this.form.packWeight) > 0){
-				totalWeight = (Number(this.form.packWeight) + Number(totalWeight)).toFixed(2)
-			}
-			return totalWeight
-		},
 		canIEdit() {
 			const { orderSn } = this.option || {};
 			if (!orderSn || this.detailsInfo.status == PURCHASE_ORDER_STATUS.CONFIRM) {
@@ -269,29 +230,41 @@ export default {
 		}
 	},
 	methods: {
+		changeYfPayWay(index){
+			this.form.yfPayWay = index
+			this.inputFn()
+		},
 		...mapActions(["initMerchantInfo"]),
 		init() {
 			this._getDet();
 		},
 		inputFn(e) {
 			let price = Number(this.selectAllPrice);
+			//打包费
 			if(Number(this.form.packingCharge) > 0){
 				price	 = Number(price) + Number(this.form.packingCharge)
 			}
-			if(Number(this.form.shortCharge) > 0){
-				price	 = Number(price) + Number(this.form.shortCharge)
-			}
-			if(Number(this.form.longCharge) > 0){
-				price	 = Number(price) + Number(this.form.longCharge)
-			}
-			if(Number(this.form.pickCharge) > 0){
-				price	 = Number(price) + Number(this.form.pickCharge)
-			}
-			if(Number(this.form.localCharge) > 0){
-				price	 = Number(price) + Number(this.form.localCharge)
+			//到付的，长途和短途运费不能算在要结帐的订单金额里。寄付的则要算。
+			if(this.form.yfPayWay == 1){
+				//短途运费
+				if(Number(this.form.shortCharge) > 0){
+					price	 = Number(price) + Number(this.form.shortCharge)
+				}
+				//长途运费
+				if(Number(this.form.longCharge) > 0){
+					price	 = Number(price) + Number(this.form.longCharge)
+				}
 			}
 			this.totalPrice = price.toFixed(2);
 			this.modifyPrice = price.toFixed(2);
+
+			let packingCharge = Number(this.form.packingCharge) > 0 ? Number(this.form.packingCharge) : 0
+			let longCharge = Number(this.form.longCharge) > 0 ? Number(this.form.longCharge) : 0
+			let shortCharge = Number(this.form.shortCharge) > 0 ? Number(this.form.shortCharge) : 0
+			let localCharge = Number(this.form.localCharge) > 0 ? Number(this.form.localCharge) : 0
+			let pickCharge = Number(this.form.pickCharge) > 0 ? Number(this.form.pickCharge) : 0
+			this.totalFreight = (packingCharge+longCharge+shortCharge+localCharge+pickCharge).toFixed(2)
+			this.perKgFreight = (this.totalFreight / this.selectAllRealityWeight).toFixed(2)
 		},
 		_getDet() {
 			let data = uni.getStorageSync("modifyShopB");
@@ -323,13 +296,10 @@ export default {
 					});
 					this.setSelectInfoByType({ type: this.pageType, info: list });
 				}
-
 				if (!this.getMerchantInfo) {
 					await this.initMerchantInfo();
 				}
-				console.log(66666, this.getMerchantInfo);
 			} catch (error) {
-				console.log(4444, error);
 			}
 		},
 
@@ -381,8 +351,6 @@ export default {
 				success: function (res) {
 					if (res.confirm) {
 						self.confirmFn();
-						// this.confirmFn();
-
 					} else if (res.cancel) {
 						console.log('用户点击取消');
 					}
@@ -391,10 +359,6 @@ export default {
 		},
 		// 表单验证
 		formSubmit(e) {
-
-			if(this.supplier==''){
-				uni.showToast({title:'请选择供应商',icon:'none'});return;
-			}
 			// 表单规则
 			let rules = [
 				{

ghsApp/src/pagesPurchase/info.vue

@@ -59,7 +59,6 @@
 						 }}</view>
 				</view>
 			</view>
-
 			<view class="title">
 				商品信息
 			</view>
@@ -98,42 +97,40 @@
 					</view>
 				</view>
 			</view>
+
 			<view 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 class="detail-price_box" style="font-size: 28rpx;">{{ detailInfo.packWeight }}</div>
+						<div class="tui-title">运费支付</div>
+						<div class="detail-price_box" style="font-size: 28rpx;">{{detailInfo.yfPayWay==1?'寄付':'到付'}}</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">打包费</div>
 						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.packingCharge }}</div>
 					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false">
+					<tui-list-cell v-if="detailInfo.yfPayWay==1" class="line-cell" :hover="false">
 						<div class="tui-title">短途运费</div>
 						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.shortCharge }}</div>
 					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false">
+					<tui-list-cell v-if="detailInfo.yfPayWay==1" class="line-cell" :hover="false">
 						<div class="tui-title">长途运费</div>
 						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.longCharge }}</div>
 					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false">
-						<div class="tui-title">提货费</div>
-						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.pickCharge }}</div>
-					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false">
-						<div class="tui-title">本地运费</div>
-						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.localCharge }}</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">
 						<div class="tui-title">总金额</div>
-						<div class="detail-price_box red" style="font-size: 30rpx;">¥{{ detailInfo.prePrice || 0.00 }}</div>
+						<div class="detail-price_box" style="font-size: 30rpx;">¥{{ detailInfo.prePrice || 0.00 }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.discountAmount > 0" class="line-cell" :hover="false">
 						<div class="tui-title">减免</div>
-						<div class="detail-price_box red" style="font-size: 30rpx;">¥{{ detailInfo.discountAmount || 0.00 }}</div>
+						<div class="detail-price_box" style="font-size: 30rpx;">¥{{ detailInfo.discountAmount || 0.00 }}</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
-						<div class="tui-title">实付</div>
+						<div class="tui-title">实际金额</div>
 						<div class="detail-price_box red" style="font-size: 30rpx;">¥{{ detailInfo.realPrice || 0.00 }}</div>
 					</tui-list-cell>
 				</div>
@@ -142,25 +139,53 @@
 				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">备注</div>
-						<input
-							:disabled="true"
-							v-model="detailInfo.remark"
-							placeholder-class="phcolor"
-							class="tui-input"
-							name="name"
-							maxlength="50"
-							type="text"
-						/>
+						<textarea style="height: 100rpx;width:350rpx;" @focus="detailInfo.remark=''" v-model="detailInfo.remark" placeholder="这里写备注"/>
+						<button class="admin-button-com blue mini-btn" @click="modifyRemark(item)" >修改</button>
+					</tui-list-cell>
+				</div>
+			</view>
+
+			<view class="content-box price-detail">
+				<div class="module-com input-line-wrap">
+					<tui-list-cell v-if="detailInfo.yfPayWay==2" class="line-cell" :hover="false">
+						<div class="tui-title">短途运费</div>
+						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.shortCharge }}</div>
+					</tui-list-cell>
+					<tui-list-cell v-if="detailInfo.yfPayWay==2" class="line-cell" :hover="false">
+						<div class="tui-title">长途运费</div>
+						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.longCharge }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">提货费</div>
+						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.pickCharge }}</div>
 					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">本地运费</div>
+						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.localCharge }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">总费用</div>
+						<div class="detail-price_box" style="font-size: 30rpx;">¥{{ detailInfo.totalFreight || 0.00 }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">总重量</div>
+						<div class="detail-price_box" style="font-size: 30rpx;">¥{{ detailInfo.totalWeight || 0.00 }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">每公斤运费</div>
+						<div class="detail-price_box" style="font-size: 30rpx;">¥{{ detailInfo.avgKgWeight || 0.00 }}</div>
+					</tui-list-cell>
+
 				</div>
 			</view>
+
 		</view>
 	</view>
 </template>
 
 <script>
 
-import { getPurchaseDetailApi } from "@/api/purchase/index";
+import { getPurchaseDetailApi,updateRemark } from "@/api/purchase/index";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
 
@@ -186,6 +211,13 @@ export default {
 
 	},
 	methods: {
+		modifyRemark(){
+			const self = this;
+			let remark = this.detailInfo.remark
+			updateRemark({id:this.detailInfo.id,remark:remark}).then((res) => {
+				self.$msg(res.msg);
+			})
+		},
 		copy(val) {
 			const self = this;
 			uni.setClipboardData({

ghsApp/src/pagesPurchase/order.vue

@@ -8,7 +8,6 @@
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</view>
-
 		<view class="app-footer open_btn">
 			<view @click="addEvent" class="admin-button-com middle blue">新增采购</view>
 		</view>
@@ -18,7 +17,6 @@
 import Tabs from "@/components/plugin/tabs";
 import OrderItem from "./orderItem";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-
 import { list } from "@/mixins";
 import { PURCHASE_ORDER_STATUS } from "@/utils/declare";
 import { getPurchaseListApi } from "@/api/purchase/index";
@@ -136,7 +134,7 @@ export default {
 		},
 		addEvent() {
 			uni.navigateTo({
-				url: `/pagesPurchase/add`,
+				url: `/pagesPurchase/supplier`,
 				success: result => {},
 				fail: () => {},
 				complete: () => {}

ghsApp/src/pagesPurchase/orderItem.vue

@@ -12,17 +12,21 @@
 		<view class="item-main" >
 			<view class="item-info">
 				<view class="info-row">
-					<text class="info-label"> 日期:</text>
+					<text class="info-label"> 日期：</text>
 					<text class="info-value">{{ info.addTime }} </text>
 				</view>
 				<view class="info-row">
-					<text class="info-label"> 单号:</text>
+					<text class="info-label"> 单号：</text>
 					<text class="info-value">{{ info.orderSn }} </text>
 				</view>
 				<view class="info-row">
-					<text class="info-label"> 人员:</text>
+					<text class="info-label"> 人员：</text>
 					<text class="info-value">{{ info.adminName }} </text>
 				</view>
+				<view class="info-row">
+					<text class="info-label"> 备注：</text>
+					<text class="info-value">{{ info.remark }} </text>
+				</view>
 			</view>
 			<view class="item-price"
 				>¥{{ info.realPrice }} <text class="iconfont iconxiangyou"></text>

ghsApp/src/pagesPurchase/supplier.vue

@@ -20,7 +20,7 @@
               <view class="accumulative">欠款: {{item.debtAmount}}</view>
             </view>
             <view class="store_btn">
-              <view class="btn_entrance" @click.stop="gotoDetails" >
+              <view class="btn_entrance" @click.stop="gotoDetails(item)" >
                 采购
               </view>
               <view class="btn_entrance" v-if="Number(item.debtAmount) > 0" @click.stop="gotoDetailsEvent(item)" >
@@ -93,9 +93,9 @@ export default {
 			});
 		},
     // 采购记录详情
-    gotoDetails () {
+    gotoDetails (item) {
       this.pageTo({
-        url: '/pagesPurchase/add',
+        url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name,
         type:2
       })
     },

ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

ghsApp/src/utils/util.js

@@ -233,7 +233,7 @@ export const $formatDate = (num, fmt = "YYYY-MM-DD HH:mm", all) => {
  * @parmas item.funtion 为可执行函数
  * @parmas item.url 为跳转的路径
  * @parmas item.query 为跳转携带的参数
- * @parmas item.type 为跳转调用的函数 1为navigateTo, 2为redirectTo, 3为reLaunch, 4为switchTab
+ * @parmas item.type 为跳转调用的函数 1为navigateTo, 2为redirectTo 关闭当前页面，跳转到应用内的某个页面 3为reLaunch 关闭所有页面，打开到应用内的某个页面  4为switchTab
  */
 export const pageTo = item => {
 	if (isNumber(item)) {