lilei 1 рік тому
батько
коміт
f5a08bc9eb

+ 18 - 4
pages/stockPan/detail.vue

@@ -2,16 +2,28 @@
 	<view class="p-content">
 		<view class="p-body">
 			<uni-forms-item label-width="100" label="产品条码:">
-				<u-text type="info" :text="formData.qrCode||'--'"></u-text>
+				<view style="display: flex;">
+					<u-text type="info" :text="formData.qrCode||'--'"></u-text>
+					<copyText :text="formData.qrCode" label="产品条码"></copyText>
+				</view>
 			</uni-forms-item>
 			<uni-forms-item label-width="100" label="产品编码:">
-				<u-text type="info" :text="formData.productCode||'--'"></u-text>
+				<view style="display: flex;">
+					<u-text type="info" :text="formData.productCode||'--'"> </u-text>
+					<copyText :text="formData.productCode" label="产品编码"></copyText>
+				</view>
 			</uni-forms-item>
 			<uni-forms-item label-width="100" label="产品名称:">
-				<u-text type="info" :text="formData.productName||'--'"></u-text>
+				<view style="display: flex;">
+					<u-text type="info" :text="formData.productName||'--'"></u-text>
+					<copyText :text="formData.productName" label="产品名称"></copyText>
+				</view>
 			</uni-forms-item>
 			<uni-forms-item label-width="100" label="原厂编码:">
-				<u-text type="info" :text="formData.productOrigCode||'--'"></u-text>
+				<view style="display: flex;">
+					<u-text type="info" :text="formData.productOrigCode||'--'"></u-text>
+					<copyText :text="formData.productOrigCode" label="原厂编码"></copyText>
+				</view>
 			</uni-forms-item>
 			<uni-forms-item label-width="100" label="产品品牌:">
 				<u-text type="info" :text="formData.brandName||'--'"></u-text>
@@ -53,7 +65,9 @@
 
 <script>
 	import { checkWarehouseDetailDel } from "@/config/api.js"
+	import copyText from '@/pages/common/copyText.vue'
 	export default {
+		components: { copyText },
 		data() {
 			return {
 				formData: null,

+ 4 - 2
pages/stockPan/index.vue

@@ -64,13 +64,15 @@
 				<uni-tr>
 					<uni-td align="center">产品编码</uni-td>
 					<uni-td align="center">库存</uni-td>
+					<uni-td align="center">盘点数量</uni-td>
 					<uni-td align="center">盈亏数量</uni-td>
 				</uni-tr>
 				<!-- 表格数据行 -->
 				<uni-tr v-for="item in detailList" :key="item.id" :checkedRow="curProduct&&curProduct.qrCode == item.qrCode" @click="toDetail(item)">
 					<uni-td width="40%" align="center">{{item.productCode}}</uni-td>
-					<uni-td width="30%" align="center">{{item.stockQty}}</uni-td>
-					<uni-td width="30%" align="center">
+					<uni-td width="20%" align="center">{{item.stockQty}}</uni-td>
+					<uni-td width="20%" align="center">{{item.checkQty}}</uni-td>
+					<uni-td width="20%" align="center">
 						 <span :style="{ color: item.checkProfitLossQty>0?'red':item.checkProfitLossQty<0?'green':'' }">{{ (item.checkProfitLossQty || item.checkProfitLossQty==0) ? Math.abs(item.checkProfitLossQty) : '--' }}</span>
 					</uni-td>
 				</uni-tr>

Різницю між файлами не показано, бо вона завелика
+ 39 - 21
unpackage/dist/dev/app-plus/app-service.js


+ 95 - 47
unpackage/dist/dev/app-plus/app-view.js

@@ -11668,16 +11668,17 @@ var render = function () {
                 [
                   _c("uni-td", { attrs: { _i: 39 } }, [_vm._v("产品编码")]),
                   _c("uni-td", { attrs: { _i: 40 } }, [_vm._v("库存")]),
-                  _c("uni-td", { attrs: { _i: 41 } }, [_vm._v("盈亏数量")]),
+                  _c("uni-td", { attrs: { _i: 41 } }, [_vm._v("盘点数量")]),
+                  _c("uni-td", { attrs: { _i: 42 } }, [_vm._v("盈亏数量")]),
                 ],
                 1
               ),
-              _vm._l(_vm._$g(42, "f"), function (item, $10, $20, $30) {
+              _vm._l(_vm._$g(43, "f"), function (item, $10, $20, $30) {
                 return _c(
                   "uni-tr",
                   {
                     key: item,
-                    attrs: { _i: "42-" + $30 },
+                    attrs: { _i: "43-" + $30 },
                     on: {
                       click: function ($event) {
                         return _vm.$handleViewEvent($event)
@@ -11685,23 +11686,26 @@ var render = function () {
                     },
                   },
                   [
-                    _c("uni-td", { attrs: { _i: "43-" + $30 } }, [
-                      _vm._v(_vm._$g("43-" + $30, "t0-0")),
-                    ]),
                     _c("uni-td", { attrs: { _i: "44-" + $30 } }, [
                       _vm._v(_vm._$g("44-" + $30, "t0-0")),
                     ]),
+                    _c("uni-td", { attrs: { _i: "45-" + $30 } }, [
+                      _vm._v(_vm._$g("45-" + $30, "t0-0")),
+                    ]),
+                    _c("uni-td", { attrs: { _i: "46-" + $30 } }, [
+                      _vm._v(_vm._$g("46-" + $30, "t0-0")),
+                    ]),
                     _c(
                       "uni-td",
-                      { attrs: { _i: "45-" + $30 } },
+                      { attrs: { _i: "47-" + $30 } },
                       [
                         _c(
                           "span",
                           {
-                            style: _vm._$g("46-" + $30, "s"),
-                            attrs: { _i: "46-" + $30 },
+                            style: _vm._$g("48-" + $30, "s"),
+                            attrs: { _i: "48-" + $30 },
                           },
-                          [_vm._v(_vm._$g("46-" + $30, "t0-0"))]
+                          [_vm._v(_vm._$g("48-" + $30, "t0-0"))]
                         ),
                       ],
                       1
@@ -11718,12 +11722,12 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(47, "sc"), attrs: { _i: 47 } },
+        { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
         [
           _c(
             "v-uni-button",
             {
-              attrs: { size: "mini", type: "warn", _i: 48 },
+              attrs: { size: "mini", type: "warn", _i: 50 },
               on: {
                 click: function ($event) {
                   return _vm.$handleViewEvent($event)
@@ -11733,7 +11737,7 @@ var render = function () {
             [
               _c(
                 "v-uni-text",
-                { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
+                { staticClass: _vm._$g(51, "sc"), attrs: { _i: 51 } },
                 [_vm._v("减")]
               ),
             ],
@@ -11742,7 +11746,7 @@ var render = function () {
           _c(
             "v-uni-button",
             {
-              attrs: { size: "mini", type: "primary", _i: 50 },
+              attrs: { size: "mini", type: "primary", _i: 52 },
               on: {
                 click: function ($event) {
                   return _vm.$handleViewEvent($event)
@@ -11752,7 +11756,7 @@ var render = function () {
             [
               _c(
                 "v-uni-text",
-                { staticClass: _vm._$g(51, "sc"), attrs: { _i: 51 } },
+                { staticClass: _vm._$g(53, "sc"), attrs: { _i: 53 } },
                 [_vm._v("加")]
               ),
             ],
@@ -11762,7 +11766,7 @@ var render = function () {
         1
       ),
       _c("scanCode", {
-        attrs: { _i: 52 },
+        attrs: { _i: 54 },
         on: {
           onKeyDown: function ($event) {
             return _vm.$handleViewEvent($event)
@@ -11992,68 +11996,108 @@ var render = function () {
           _c(
             "uni-forms-item",
             { attrs: { _i: 2 } },
-            [_c("u-text", { attrs: { _i: 3 } })],
+            [
+              _c(
+                "uni-view",
+                { staticStyle: { display: "flex" }, attrs: { _i: 3 } },
+                [
+                  _c("u-text", { attrs: { _i: 4 } }),
+                  _c("copyText", { attrs: { _i: 5 } }),
+                ],
+                1
+              ),
+            ],
             1
           ),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 4 } },
-            [_c("u-text", { attrs: { _i: 5 } })],
+            { attrs: { _i: 6 } },
+            [
+              _c(
+                "uni-view",
+                { staticStyle: { display: "flex" }, attrs: { _i: 7 } },
+                [
+                  _c("u-text", { attrs: { _i: 8 } }),
+                  _c("copyText", { attrs: { _i: 9 } }),
+                ],
+                1
+              ),
+            ],
             1
           ),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 6 } },
-            [_c("u-text", { attrs: { _i: 7 } })],
+            { attrs: { _i: 10 } },
+            [
+              _c(
+                "uni-view",
+                { staticStyle: { display: "flex" }, attrs: { _i: 11 } },
+                [
+                  _c("u-text", { attrs: { _i: 12 } }),
+                  _c("copyText", { attrs: { _i: 13 } }),
+                ],
+                1
+              ),
+            ],
             1
           ),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 8 } },
-            [_c("u-text", { attrs: { _i: 9 } })],
+            { attrs: { _i: 14 } },
+            [
+              _c(
+                "uni-view",
+                { staticStyle: { display: "flex" }, attrs: { _i: 15 } },
+                [
+                  _c("u-text", { attrs: { _i: 16 } }),
+                  _c("copyText", { attrs: { _i: 17 } }),
+                ],
+                1
+              ),
+            ],
             1
           ),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 10 } },
-            [_c("u-text", { attrs: { _i: 11 } })],
+            { attrs: { _i: 18 } },
+            [_c("u-text", { attrs: { _i: 19 } })],
             1
           ),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 12 } },
-            [_c("u-text", { attrs: { _i: 13 } })],
+            { attrs: { _i: 20 } },
+            [_c("u-text", { attrs: { _i: 21 } })],
             1
           ),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 14 } },
-            [_c("u-text", { attrs: { _i: 15 } })],
+            { attrs: { _i: 22 } },
+            [_c("u-text", { attrs: { _i: 23 } })],
             1
           ),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 16 } },
-            [_c("u-text", { attrs: { _i: 17 } })],
+            { attrs: { _i: 24 } },
+            [_c("u-text", { attrs: { _i: 25 } })],
             1
           ),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 18 } },
+            { attrs: { _i: 26 } },
             [
-              _c("span", { style: _vm._$g(19, "s"), attrs: { _i: 19 } }, [
-                _vm._v(_vm._$g(19, "t0-0")),
+              _c("span", { style: _vm._$g(27, "s"), attrs: { _i: 27 } }, [
+                _vm._v(_vm._$g(27, "t0-0")),
               ]),
             ],
             1
           ),
-          _vm._$g(20, "i")
+          _vm._$g(28, "i")
             ? _c(
                 "uni-forms-item",
-                { attrs: { _i: 20 } },
+                { attrs: { _i: 28 } },
                 [
-                  _c("span", { style: _vm._$g(21, "s"), attrs: { _i: 21 } }, [
-                    _vm._v("¥" + _vm._$g(21, "t0-0")),
+                  _c("span", { style: _vm._$g(29, "s"), attrs: { _i: 29 } }, [
+                    _vm._v("¥" + _vm._$g(29, "t0-0")),
                   ]),
                 ],
                 1
@@ -12061,16 +12105,16 @@ var render = function () {
             : _vm._e(),
           _c(
             "uni-forms-item",
-            { attrs: { _i: 22 } },
+            { attrs: { _i: 30 } },
             [
-              _vm._$g(23, "i")
-                ? _c("u-text", { attrs: { _i: 23 } })
-                : _c("u-text", { attrs: { _i: 24 } }),
+              _vm._$g(31, "i")
+                ? _c("u-text", { attrs: { _i: 31 } })
+                : _c("u-text", { attrs: { _i: 32 } }),
             ],
             1
           ),
           _c("u-modal", {
-            attrs: { _i: 25 },
+            attrs: { _i: 33 },
             on: {
               confirm: function ($event) {
                 return _vm.$handleViewEvent($event)
@@ -12086,15 +12130,15 @@ var render = function () {
         ],
         1
       ),
-      _vm._$g(26, "i")
+      _vm._$g(34, "i")
         ? _c(
             "uni-view",
-            { staticClass: _vm._$g(26, "sc"), attrs: { _i: 26 } },
+            { staticClass: _vm._$g(34, "sc"), attrs: { _i: 34 } },
             [
               _c(
                 "v-uni-button",
                 {
-                  attrs: { size: "mini", type: "warn", _i: 27 },
+                  attrs: { size: "mini", type: "warn", _i: 35 },
                   on: {
                     click: function ($event) {
                       return _vm.$handleViewEvent($event)
@@ -12881,17 +12925,21 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 158);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _copyText = _interopRequireDefault(__webpack_require__(/*! @/pages/common/copyText.vue */ 549));
 var _default = {
   data: function data() {
     return {
       wxsProps: {}
     };
   },
-  components: {}
+  components: {
+    'copyText': _copyText.default
+  }
 };
 exports.default = _default;
 

Деякі файли не було показано, через те що забагато файлів було змінено