lilei před 1 rokem
rodič
revize
ae461074af

+ 1 - 1
config/api.js

@@ -124,7 +124,7 @@ export const updateRealPutQty = (params, config = {}) => http.post(`/receivingDe
 // 采购入库详细列表
 export const receivingDetail = (params, config = {}) => http.post(`/receivingDetail/queryPage/${params.pageNo}/${params.pageSize}`, params, config)
 // 采购入库详情
-export const receivingQuery = (params, config = {}) => http.post(`/receiving/query`, params, config)
+export const receivingQuery = (params, config = {}) => http.post(`/receiving/findBySn`, params, config)
 //  采购 入库
 export const purchaseWriteStockIn = (params, config = {}) => http.post(`/receiving/pdaStockIn`, params, config)
 //  采购入库 修改仓库仓位

+ 2 - 2
config/request.js

@@ -4,9 +4,9 @@ module.exports = (vm) => {
     // 初始化请求配置
     uni.$u.http.setConfig((config) => {
         /* config 为默认全局配置*/
-        // config.baseURL = 'http://192.168.2.117/qpls-md'; /* 开发 */
+        config.baseURL = 'http://192.168.2.117/qpls-md'; /* 开发 */
 		// config.baseURL = 'https://iscm.360arrow.com/qpls-md'; /* 生产 */
-		config.baseURL = 'https://p.iscm.360arrow.com/qpls-md'; /* 预发布 */
+		// config.baseURL = 'https://p.iscm.360arrow.com/qpls-md'; /* 预发布 */
 		config.custom.auth = true
         return config
     })

+ 10 - 10
pages/purchasing/index.vue

@@ -4,7 +4,7 @@
 			<view>
 				<view>
 					<text>采购单号:</text>
-					<text style="color: crimson;">{{baseData[0].purchaseBillNo}}</text>
+					<text style="color: crimson;">{{baseData.purchaseBillNo}}</text>
 				</view>
 				<view>
 					<button :disabled="loading" size="mini" type="primary" @click="toOut"> 入库 <text class="iconfont icon-icon-test43"></text></button>
@@ -13,7 +13,7 @@
 			<view>
 				<view>
 					<text>发货单号:</text>
-					<text style="color: crimson;">{{baseData[0].sendBillNo}}</text>
+					<text style="color: crimson;">{{baseData.sendBillNo}}</text>
 				</view>
 			</view>
 			<view>
@@ -30,12 +30,12 @@
 					</view>
 				</view>
 			</view>
-			<view style="justify-content: flex-start;flex-wrap: wrap;"  v-for="(item,bindex) in baseData" :key="item.id">
-				<view>总款数:{{ item.totalPutCategory }}</view>
-				<view>发货数量: {{ item.totalPutQty }}</view>
-				<view>发货金额: {{ item.totalPutAmount?toThousands(item.totalPutAmount,2):'0.00' }}</view>
-				<view>入库数量: {{ item && (item.totalRealPutQty || item.totalRealPutQty==0) ? item.totalRealPutQty : '--' }}</view>
-				<view>入库金额: {{ item && (item.totalRealPutAmount || item.totalRealPutAmount==0) ? toThousands(item.totalRealPutAmount, 2) : '--' }}</view>
+			<view style="justify-content: flex-start;flex-wrap: wrap;"  v-if="baseData">
+				<view>总款数:{{ baseData.totalPutCategory }}</view>
+				<view>发货数量: {{ baseData.totalPutQty }}</view>
+				<view>发货金额: {{ baseData.totalPutAmount?toThousands(baseData.totalPutAmount,2):'0.00' }}</view>
+				<view>入库数量: {{ baseData && (baseData.totalRealPutQty || baseData.totalRealPutQty==0) ? baseData.totalRealPutQty : '--' }}</view>
+				<view>入库金额: {{ baseData && (baseData.totalRealPutAmount || baseData.totalRealPutAmount==0) ? toThousands(baseData.totalRealPutAmount, 2) : '--' }}</view>
 			</view>
 		</view>
 		<view class="p-body">
@@ -261,7 +261,7 @@
 			},
 			// 详情
 			getDetail(){
-				receivingQuery({receivingBillSn: this.receivingBillSn}).then(res => {
+				receivingQuery({receivingBillSn: this.receivingBillSn, source : "PDA"}).then(res => {
 					console.log(res,'详情')
 					if(res.status == 200){
 						this.baseData = res.data
@@ -307,7 +307,7 @@
 			},
 			async submitForm(){
 				const a = this.defWarehouse
-				const ret = await purchaseWriteStockIn({id: this.baseData[0].id,warehouseSn:a[0], warehouseLocationSn:a[1]})
+				const ret = await purchaseWriteStockIn({id: this.baseData.id,warehouseSn:a[0], warehouseLocationSn:a[1]})
 				if(ret.status == 200){
 					this.$store.state.vuex_isRefash = true
 					uni.navigateBack()

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 50 - 82
unpackage/dist/dev/app-plus/app-view.js

@@ -1403,42 +1403,11 @@ var render = function () {
                   _c(
                     "v-uni-text",
                     { staticClass: _vm._$g(27, "sc"), attrs: { _i: 27 } },
-                    [_vm._v("入库记录")]
-                  ),
-                ],
-                1
-              ),
-            ],
-            1
-          ),
-          _c(
-            "uni-view",
-            { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
-            [
-              _c(
-                "uni-view",
-                {
-                  attrs: { _i: 29 },
-                  on: {
-                    click: function ($event) {
-                      return _vm.$handleViewEvent($event)
-                    },
-                  },
-                },
-                [
-                  _c("v-uni-text", {
-                    staticClass: _vm._$g(30, "sc"),
-                    attrs: { _i: 30 },
-                  }),
-                  _c(
-                    "v-uni-text",
-                    { staticClass: _vm._$g(31, "sc"), attrs: { _i: 31 } },
                     [_vm._v("条码维护")]
                   ),
                 ],
                 1
               ),
-              _c("uni-view", { attrs: { _i: 32 } }),
             ],
             1
           ),
@@ -1447,19 +1416,19 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(33, "sc"), attrs: { _i: 33 } },
+        { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
         [
-          _c("uni-view", { attrs: { _i: 34 } }, [
-            _vm._v("系统版本:" + _vm._$g(34, "t0-0")),
+          _c("uni-view", { attrs: { _i: 29 } }, [
+            _vm._v("系统版本:" + _vm._$g(29, "t0-0")),
           ]),
-          _c("uni-view", { attrs: { _i: 35 } }, [
+          _c("uni-view", { attrs: { _i: 30 } }, [
             _vm._v("Copyright © 2023 陕西山海高科信息技术有限公司"),
           ]),
         ],
         1
       ),
       _c("u-action-sheet", {
-        attrs: { _i: 36 },
+        attrs: { _i: 31 },
         on: {
           close: function ($event) {
             return _vm.$handleViewEvent($event)
@@ -23297,39 +23266,38 @@ var render = function () {
                 ],
                 1
               ),
-              _vm._l(_vm._$g(18, "f"), function (item, bindex, $20, $30) {
-                return _c(
-                  "uni-view",
-                  {
-                    key: item,
-                    staticStyle: {
-                      "justify-content": "flex-start",
-                      "flex-wrap": "wrap",
+              _vm._$g(18, "i")
+                ? _c(
+                    "uni-view",
+                    {
+                      staticStyle: {
+                        "justify-content": "flex-start",
+                        "flex-wrap": "wrap",
+                      },
+                      attrs: { _i: 18 },
                     },
-                    attrs: { _i: "18-" + $30 },
-                  },
-                  [
-                    _c("uni-view", { attrs: { _i: "19-" + $30 } }, [
-                      _vm._v("总款数:" + _vm._$g("19-" + $30, "t0-0")),
-                    ]),
-                    _c("uni-view", { attrs: { _i: "20-" + $30 } }, [
-                      _vm._v("发货数量: " + _vm._$g("20-" + $30, "t0-0")),
-                    ]),
-                    _c("uni-view", { attrs: { _i: "21-" + $30 } }, [
-                      _vm._v("发货金额: " + _vm._$g("21-" + $30, "t0-0")),
-                    ]),
-                    _c("uni-view", { attrs: { _i: "22-" + $30 } }, [
-                      _vm._v("入库数量: " + _vm._$g("22-" + $30, "t0-0")),
-                    ]),
-                    _c("uni-view", { attrs: { _i: "23-" + $30 } }, [
-                      _vm._v("入库金额: " + _vm._$g("23-" + $30, "t0-0")),
-                    ]),
-                  ],
-                  1
-                )
-              }),
+                    [
+                      _c("uni-view", { attrs: { _i: 19 } }, [
+                        _vm._v("总款数:" + _vm._$g(19, "t0-0")),
+                      ]),
+                      _c("uni-view", { attrs: { _i: 20 } }, [
+                        _vm._v("发货数量: " + _vm._$g(20, "t0-0")),
+                      ]),
+                      _c("uni-view", { attrs: { _i: 21 } }, [
+                        _vm._v("发货金额: " + _vm._$g(21, "t0-0")),
+                      ]),
+                      _c("uni-view", { attrs: { _i: 22 } }, [
+                        _vm._v("入库数量: " + _vm._$g(22, "t0-0")),
+                      ]),
+                      _c("uni-view", { attrs: { _i: 23 } }, [
+                        _vm._v("入库金额: " + _vm._$g(23, "t0-0")),
+                      ]),
+                    ],
+                    1
+                  )
+                : _vm._e(),
             ],
-            2
+            1
           )
         : _vm._e(),
       _c(
@@ -23352,12 +23320,12 @@ var render = function () {
                 ],
                 1
               ),
-              _vm._l(_vm._$g(30, "f"), function (item, $11, $21, $31) {
+              _vm._l(_vm._$g(30, "f"), function (item, $10, $20, $30) {
                 return _c(
                   "uni-tr",
                   {
                     key: item,
-                    attrs: { _i: "30-" + $31 },
+                    attrs: { _i: "30-" + $30 },
                     on: {
                       click: function ($event) {
                         return _vm.$handleViewEvent($event)
@@ -23367,27 +23335,27 @@ var render = function () {
                   [
                     _c(
                       "uni-td",
-                      { attrs: { _i: "31-" + $31 } },
+                      { attrs: { _i: "31-" + $30 } },
                       [
-                        _c("uni-view", { attrs: { _i: "32-" + $31 } }, [
-                          _vm._v(_vm._$g("32-" + $31, "t0-0")),
+                        _c("uni-view", { attrs: { _i: "32-" + $30 } }, [
+                          _vm._v(_vm._$g("32-" + $30, "t0-0")),
                         ]),
                       ],
                       1
                     ),
                     _c(
                       "uni-td",
-                      { attrs: { _i: "33-" + $31 } },
+                      { attrs: { _i: "33-" + $30 } },
                       [
                         _c(
                           "uni-view",
-                          { attrs: { _i: "34-" + $31 } },
+                          { attrs: { _i: "34-" + $30 } },
                           [
-                            _c("uni-view", { attrs: { _i: "35-" + $31 } }, [
-                              _vm._v(_vm._$g("35-" + $31, "t0-0") + "/"),
+                            _c("uni-view", { attrs: { _i: "35-" + $30 } }, [
+                              _vm._v(_vm._$g("35-" + $30, "t0-0") + "/"),
                             ]),
-                            _c("uni-view", { attrs: { _i: "36-" + $31 } }, [
-                              _vm._v(_vm._$g("36-" + $31, "t0-0")),
+                            _c("uni-view", { attrs: { _i: "36-" + $30 } }, [
+                              _vm._v(_vm._$g("36-" + $30, "t0-0")),
                             ]),
                           ],
                           1
@@ -23397,17 +23365,17 @@ var render = function () {
                     ),
                     _c(
                       "uni-td",
-                      { attrs: { _i: "37-" + $31 } },
+                      { attrs: { _i: "37-" + $30 } },
                       [
                         _c(
                           "v-uni-text",
                           {
                             staticStyle: { color: "red" },
-                            attrs: { _i: "38-" + $31 },
+                            attrs: { _i: "38-" + $30 },
                           },
-                          [_vm._v(_vm._$g("38-" + $31, "t0-0"))]
+                          [_vm._v(_vm._$g("38-" + $30, "t0-0"))]
                         ),
-                        _vm._v("/" + _vm._$g("37-" + $31, "t1-0")),
+                        _vm._v("/" + _vm._$g("37-" + $30, "t1-0")),
                       ],
                       1
                     ),

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů