From 057fab70a035e90c8b9e42bb7c72b853183d297c Mon Sep 17 00:00:00 2001 From: fanfan Date: Tue, 2 Jul 2024 21:34:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/model/goods/Index.js | 2 +- src/views/goods/Create.vue | 11 ++++++----- src/views/goods/modules/Update.vue | 7 ++++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/common/model/goods/Index.js b/src/common/model/goods/Index.js index fe49752..650e823 100644 --- a/src/common/model/goods/Index.js +++ b/src/common/model/goods/Index.js @@ -95,7 +95,7 @@ export default { 'status', 'spec_type', 'deduct_stock_type', 'is_restrict', 'content', 'selling_point', 'serviceIds', 'sales_initial', 'is_points_gift', 'is_points_discount', 'is_enable_grade', 'is_alone_grade', 'is_ind_dealer', - 'dealer_money_type', 'first_money', 'second_money', 'third_money', 'cmmdty_model','is_check','goods_source','delivery_time','is_in_store','remark' + 'dealer_money_type', 'first_money', 'second_money', 'third_money', 'cmmdty_model','is_check','goods_source','delivery_time','is_in_store','remark','is_use_jd_stock' ]) console.log(goodsFormData, 100) return { diff --git a/src/views/goods/Create.vue b/src/views/goods/Create.vue index 2c4c08a..e0f39c1 100644 --- a/src/views/goods/Create.vue +++ b/src/views/goods/Create.vue @@ -85,11 +85,12 @@ 是 - - - + + + 否 + 是 + + diff --git a/src/views/goods/modules/Update.vue b/src/views/goods/modules/Update.vue index b6625d2..49e8867 100644 --- a/src/views/goods/modules/Update.vue +++ b/src/views/goods/modules/Update.vue @@ -85,7 +85,12 @@ 是 - + + + 否 + 是 + + From fc31d6bc9450ba23af56fed58cfb6f2d1c1c6bf3 Mon Sep 17 00:00:00 2001 From: fanfan Date: Sun, 7 Jul 2024 21:08:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=9B=BE=E6=A0=87=20?= =?UTF-8?q?=E5=92=8C=E5=BD=92=E5=B1=9E=E5=9C=B0=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shenhe.png | Bin 0 -> 1279 bytes src/components/Table/GoodsItem/GoodsItem.vue | 17 +++++++++++++++++ src/components/Table/UserItem/UserItem.vue | 13 ++++++++----- src/views/order/Index.vue | 7 +++++++ 4 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 src/assets/img/shenhe.png diff --git a/src/assets/img/shenhe.png b/src/assets/img/shenhe.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d0ac72913e39f3e291df217318f19b53d19836 GIT binary patch literal 1279 zcmVPx(xk*GpR9Hu~m|@7CQy9np|MI~HA1EIvLWmE_Rx66K)r2T3ibAHgtV||bRw&{F zv22-G$b_1#Oe~X?DMD5zJ}6|X6=lT-A68bE`}erc(|PXqzMtoQU+=DZ>+L@0T<3qT z>wo^&bsp<~SVUYSX``f->1Lm#mu-K%P`94%!iYFs(k+rUOS-6M{UJ#^CGD_%d_H>& z1{4vOOS)6i8cBdE_7_o+bV`n&)fxlXF56!Z0X7FvMBo^w7dDPAm2{<~<;{uDZ#g_D zX}hGiZJ%H)B2JZbo1_hrmbB&{mb70I(fdKt5!-y5uo0k$xFWd#0MdZtE@R_el3um_ z*|ZZ!1P6Jb0kCR{KhpWLq#q?cM--jJgp7S4IK}5pq?ohUHYplx$+?>|%2!X}9pG*P z(3hDOHrg!-03iMa^tS&Vy!(KO5pi0Af)dbxtPsUB8$bsE^iL9UgY9htd@lNwh#<9F zC7l3JdWbZ-hDn;dIy~JG~7nFGs@qAWyK5e!AU^Vt@)g?>=^l8?*-2i%|DIHHW)t;JlMrkEl zJUD59vfcSJBe@ws^g1BKmUp!k5m5sIcuC7>O?9p5b?UT`+S1H*Mkpe#%5LJn{SzU? zX5mE0tI)Rr(G?V1)^rJ|HO3A6sv5g>7Kf^ob0N+y4caS7PClO7z74GiEgFaN_WqW^ z7)eF}#3{eYlg&}nlL)A;0!wUvH}0vM&ap5Z;kvl)3|oL0zoDvU4`p-DdESz=rApaH zm3B>VC>yn(a(sNlYe4kXCI1tO8xaT}fV(O_I)mn5RQs-H&rwML8mn|fyd-H|t{X*% z|0iA@5mC6r*s7+GzF%MeuK#D1j-E9)N;Cyfz?i+V>d=2)@iVy>+k67f{n- z(o6G%VlT?f(wZJ!?=n({mQWB`fHocJLzH#s`W)ZaR}UF)z@L}CY3@nw%BI8oqW0bS za*c>PlAz3;32IhaJHYVicH8f?*Y-Z8tCs+4ASDhaPBR2Zf+6aNX}J^|ZP&MP>}u-U zzG+SF%jXHVh!EpwPR}%hW5@!v5(?1zqI11IX8zdFJS4Bn)0H*?eytfm_Dizn@mj^G zfkb)lv;)iplp%+N?{e$X8PVbwk1e)I=hz~Gw9rA&Cl!4{-|n)_JASGS0+gT#Ia2?4 z)sg~?i1Ekf{J_ACtA&zR$F{DvrVH6%KxJ`6@KX&fCn`JbR}#v|W9

{{ dataObj.title }}

+

{{ dataObj.subtitle }} @@ -37,6 +38,7 @@ export default { data: PropTypes.object.def({}), // 副标题颜色 subTitleColor: PropTypes.bool.def(false), + source: PropTypes.any.def(0), }, computed: { dataObj() { @@ -48,6 +50,7 @@ export default { subtitle: '', goodsProps: [], titleWidth: 200, + isCheck:'' }, this.$props.data ) @@ -64,6 +67,20 @@ export default {