Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-repair-app

config.js

@@ -1,9 +1,9 @@
 // 应用全局配置
 module.exports = {
-	// baseUrl: 'https://www.nuoyunr.com',
+	baseUrl: 'https://www.nuoyunr.com',
 	// baseUrl: 'http://124.222.105.7:48080',
 	// baseUrl: 'http://192.168.1.4:48080',
-	baseUrl: "http://localhost:48080",
+	// baseUrl: "http://localhost:48080",
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio/',
 	shareUrl: 'https://www.lighting-it.cn/share?inviteId=',

pages-home/service/todoDetail.vue

@@ -199,6 +199,7 @@ export default {
       },
       //是否可以点击
       canClick:true,
+      subLoading: false
     };
   },
   onLoad(data) {
@@ -356,54 +357,60 @@ export default {
       })
     },
     confirmOpe(type) {
-      if(this.selectWares.length==0){
+      if (!this.subLoading){
-        uni.showToast({
+        this.subLoading = true
-          title: '请选中要审核的配件！',
+        if(this.selectWares.length==0){
-          icon: 'none'
+          uni.showToast({
-        })
+            title: '请选中要审核的配件！',
-        return
+            icon: 'none'
-      }
-      if (this.canClick) {
-        this.canClick = false
-        let url = '/admin-api/repair/tw/audit'
-        let dataObj = {
-          id: this.id,
-          type: "01",
-          status: "yes" == type ? "01" : "02"
-        }
-        try {
-          if (this.selectWares && this.selectWares.length > 0) {
-            dataObj.items = [...this.selectWares.map(item => {
-              return {
-                id: item.id
-              }
-            })]
-          } else {
-            dataObj.items = []
-            this.repairList.map((groupItem) => {
-              groupItem.twItemList.map((item) => {
-                dataObj.items.push({id: item.id})
-              })
-            })
-          }
-          request({
-            url: url,
-            method: 'POST',
-            data: dataObj
-          }).then((res) => {
-            this.canClick = true
-            if (res.code == 200) {
-              uni.showToast({
-                title: '审批成功！',
-                icon: 'none'
-              })
-              setTimeout(() => {
-                uni.navigateBack()
-              }, 700)
-            }
           })
-        } catch (e) {
+          this.subLoading = false
-          this.canClick = true
+          return
+        }
+        if (this.canClick) {
+          this.canClick = false
+          let url = '/admin-api/repair/tw/audit'
+          let dataObj = {
+            id: this.id,
+            type: "01",
+            status: "yes" == type ? "01" : "02"
+          }
+          try {
+            if (this.selectWares && this.selectWares.length > 0) {
+              dataObj.items = [...this.selectWares.map(item => {
+                return {
+                  id: item.id
+                }
+              })]
+            } else {
+              dataObj.items = []
+              this.repairList.map((groupItem) => {
+                groupItem.twItemList.map((item) => {
+                  dataObj.items.push({id: item.id})
+                })
+              })
+            }
+            request({
+              url: url,
+              method: 'POST',
+              data: dataObj
+            }).then((res) => {
+              this.canClick = true
+              if (res.code == 200) {
+                uni.showToast({
+                  title: '审批成功！',
+                  icon: 'none'
+                })
+                setTimeout(() => {
+                  uni.navigateBack()
+                }, 700)
+              }
+              this.subLoading = false
+            })
+          } catch (e) {
+            this.subLoading = false
+            this.canClick = true
+          }
         }
       }
     },

pages-warehouse/inOutWarehouse/part.vue

@@ -96,7 +96,7 @@
       <text class="label"></text>
       <text class="repairNum"></text>
       <view class="submit" @click="submit" v-if="!isInput">保存</view>
-      <view class="submit" @click="inWare" v-else>入库</view>
+      <view class="submit" @click="inWare" v-else :disabled="subLoading">入库</view>
     </view>
   </view>
 </template>
@@ -143,6 +143,7 @@ export default {
       unitList: [],
       query: null,
       selectRows: [],
+      subLoading: false
     };
   },
   onLoad(data) {
@@ -393,13 +394,15 @@ export default {
       }).then(res => {
         this.partList = Object.entries(res.data)
         this.partList = this.partList.map(([key, value]) => {
-          return [key, value.filter(item => (!item.inCount && item.inCount !== item.goodsCount))]
+          return [key, value.filter(item => {
+            return item.inCount !== item.goodsCount
+          })]
         })
         this.partList = this.partList.filter(([key, value]) => value.length > 0)
         this.partList.forEach(([key, value]) => {
           value.forEach(item => {
-            item.goodsCount = item.goodsCount - item?.inCount | 0
+            item.goodsCount = item.goodsCount - (item.inCount ? item.inCount : 0)
-            item.inCount = item.goodsCount - item?.inCount | 0
+            item.inCount = item.goodsCount
           })
         })
         const values = this.partList.map(([key, value]) => value)
@@ -422,33 +425,39 @@ export default {
      * 入库
      */
     inWare() {
-      const data = {
+      if (!this.subLoading){
-        id: this.soId,
+        this.subLoading = true
-        soNo: createUniqueCodeByHead("RK")
+        const data = {
-      }
+          id: this.soId,
-      if (this.selectRows && this.selectRows.length > 0){
+          soNo: createUniqueCodeByHead("RK")
-        data.soiList = [...this.selectRows]
-        data.waresList = [...this.selectRows.map(item => item.wares)]
-      }else {
-        const values = this.partList.map(([key, value]) => value).reduce((acc, item) => acc.concat(item))
-        data.soiList = [...values]
-        data.waresList = [...values.map(item => item.wares)]
-      }
-      request({
-        url: '/admin-api/repair/so/inWare',
-        method: 'post',
-        data: data
-      }).then((res) => {
-        if (res.code == 200) {
-          uni.showToast({
-            title: '入库成功！',
-            icon: 'none'
-          })
-          setTimeout(() => {
-            uni.navigateBack()
-          }, 700)
         }
-      })
+        const values = this.partList.map(([key, value]) => value).reduce((acc, item) => acc.concat(item))
+        if (this.selectRows && this.selectRows.length > 0){
+          const ids = this.selectRows.map(item => item.id)
+          const newSelect = values.filter(item => ids.includes(item.id))
+          data.soiList = [...newSelect]
+          data.waresList = [...newSelect.map(item => item.wares)]
+        }else {
+          data.soiList = [...values]
+          data.waresList = [...values.map(item => item.wares)]
+        }
+        request({
+          url: '/admin-api/repair/so/inWare',
+          method: 'post',
+          data: data
+        }).then((res) => {
+          if (res.code == 200) {
+            uni.showToast({
+              title: '入库成功！',
+              icon: 'none'
+            })
+            setTimeout(() => {
+              uni.navigateBack()
+            }, 700)
+          }
+          this.subLoading = false
+        })
+      }
       // this.partList.forEach(item => {
       //   item.inCount = item.count
       //   item.goodsId = item.id