修改还

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // let devModules = ['all']
 // let devModules = ['index', 'OYE']
 let devModules = ['all']
-// let devModules = ['index', 'OYE', 'statisticalReport']
+// let devModules = ['index', 'OYE']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

src/views/OYE/components/oYeRealTimeInventory.vue

@@ -461,6 +461,7 @@ export default {
         '，',
         ','
       )
+      this.updateInsertForm.userName = getCookie('loginName')
       this.$confirm('确定保存吗？', '提示', {
         type: 'warning'
       }).then(() => {

src/views/OYE/components/oYeTransResult.vue

@@ -160,6 +160,14 @@
             ><i class="el-icon-check"></i>出库确认</el-button
           ></el-form-item
         >
+        <el-form-item
+          ><el-button
+            type="primary"
+            @click="reConfirmInbound"
+            v-privilege="activeMenu + 'reConfirmInbound'"
+            ><i class="el-icon-check"></i>重新出库</el-button
+          ></el-form-item
+        >
         <el-form-item v-privilege="activeMenu + 'more'">
           <el-dropdown>
             <el-button type="primary">
@@ -2269,6 +2277,7 @@ export default {
       let flag = 1
       let arr = item.mapList.map(e => {
         let map = {}
+        map = JSON.parse(JSON.stringify(e))
         map.capacityId = item.capacityId
         map.capacityNumber = item.capacityNo
         map.consigneeId = e.consigneeId
@@ -2303,6 +2312,7 @@ export default {
       this.axios
         .post('/api/v1/wms/insertOyeOutboundResult', {
           orderId: data[0].orderId,
+          reUpdateOutBound: this.steelMap.reUpdateOutBound,
           mapList: data
         })
         .then(res => {
@@ -2347,6 +2357,33 @@ export default {
           })
       }
     },
+    reConfirmInbound() {
+      if (Object.values(this.steelMap).length == 0) {
+        this.$message.error('请点击需要执行更改操作的行！')
+        return
+      }
+      // 将中文逗号替换为英文逗号
+      if (Object.keys(this.steelMap).length > 0) {
+        this.axios
+          .post(
+            '/api/v1/tms/getOyeSteelReportDetailsBySmId?saleOrderMaterialId=' +
+              this.steelMap.saleOrderMaterialId
+          )
+          .then(res => {
+            this.steelMap = res.data.data
+            if (getCookie('orgCode') == 'ouyechangwaiku') {
+              let inboundWarehouse = getCookie('loginName')
+              this.steelMap.mapList = this.steelMap.mapList.filter(item => {
+                return item.inboundWarehouse == inboundWarehouse
+              })
+            }
+            this.steelMap.userName = getCookie('loginName')
+            this.steelMap.reUpdateOutBound = 1
+            this.confireInboundVisible = true
+            this.getSpanArr1(res.data.data.mapList)
+          })
+      }
+    },
     openBlank() {
       let page = this.$router.resolve({
         name: 'saleSteelReports',