feat 调整入库

src/views/stockIn/StockInByCharge/index.vue

@@ -23,14 +23,10 @@
           <span>入库单详细信息</span>
         </div>
       </div>
+<!--      <el-table class="info-table" border v-loading="loading" :data="state.MATERIALRECEIVEACT" highlight-current-row row-key="id" @row-click="handle">-->
       <el-table class="info-table" border v-loading="loading" :data="state.MATERIALRECEIVEACT"
-                highlight-current-row row-key="id" @row-click="handle">
+                highlight-current-row row-key="id">
         <el-table-column prop="MATERIALSPECNAME" fixed="left" label="料号" width="100" />
-        <el-table-column prop="DESC_CN" label="品名" width="280" />
-        <el-table-column prop="DESCRIPTION" label="物料规格" width="100" />
-        <el-table-column prop="SDK_ID" label="斯迪克规格ID" v-if="false" width="80" />
-        <el-table-column prop="SPECNAME" label="斯迪克规格" width="100" />
-        <el-table-column prop="PHASE" label="阶段" width="80" />
         <el-table-column prop="ERPFACTORY" label="组织" width="100" />
         <el-table-column prop="ERPLOCATION" label="库位" width="180">
           <template #default="scope">
@@ -45,6 +41,11 @@
         <el-table-column prop="STOCKINQTY" label="已入库数量" width="100" />
         <el-table-column prop="CREATEQTY" label="本次创建数量" width="100" />
         <el-table-column prop="MINUSQTY" label="剩余数量" width="100" />
+        <el-table-column prop="DESC_CN" label="品名" width="280" />
+        <el-table-column prop="DESCRIPTION" label="物料规格" width="100" />
+        <el-table-column prop="SDK_ID" label="斯迪克规格ID" v-if="false" width="80" />
+        <el-table-column prop="SPECNAME" label="斯迪克规格" width="100" />
+        <el-table-column prop="PHASE" label="阶段" width="80" />
         <el-table-column prop="MAKEDATE" label="生产日期" width="120">
           <template #default="scope">
             <el-date-picker v-model="scope.row['MAKEDATE']" type="date" style="width: 110px"
@@ -81,18 +82,19 @@
         </div>
       </div>
       <el-table class="charge-table" :height="tableHeight" :data="state.MATERIALPACKINGLIST" border show-summary>
-        <el-table-column prop="SEQ" label="序号" fixed="left" width="100" />
+<!--        <el-table-column prop="SEQ" label="序号" fixed="left" width="100" />-->
+        <el-table-column prop="CHARGE" label="批次" fixed="left" width="180" />
+        <el-table-column prop="MATERIALSPECNAME" fixed="left" label="料号" width="100" />
+        <el-table-column prop="ERPFACTROY" label="组织" v-if="false" width="180" />
+        <el-table-column prop="ERPFACTROYDESC" label="组织(CN)" width="220" />
         <el-table-column prop="RECEIVEREQUESTNAME" label="单号" width="120" />
         <el-table-column prop="MATERIALPACKINGNAME" label="标签" fixed="left" v-if="false" width="180" />
-        <el-table-column prop="CHARGE" label="批次" fixed="left" width="180" />
         <el-table-column prop="DESC_CN" label="品名" width="280" />
         <el-table-column prop="DESCRIPTION" label="物料规格" width="180" />
         <el-table-column prop="TRUEGG" label="实际规格" width="150" />
         <el-table-column prop="SDK_ID" label="斯迪克规格ID" v-if="false" width="80" />
         <el-table-column prop="SPECNAME" label="斯迪克规格" width="180" />
         <el-table-column prop="PHASE" label="阶段" width="80" />
-        <el-table-column prop="ERPFACTROY" label="组织" v-if="false" width="180" />
-        <el-table-column prop="ERPFACTROYDESC" label="组织(CN)" width="220" />
         <el-table-column prop="ERPLOCATION" label="库位" v-if="false" width="180" />
         <el-table-column prop="ERPLOCATIONDESC" label="库位(CN)" width="180" />
         <el-table-column prop="LOCATIONNAME" label="货位" v-if="false" width="180" />
@@ -699,7 +701,9 @@ async function sendToERP() {
       return
     }
     PurInSendERPByCharge({
-      materialreceiveAct: state.MATERIALPACKINGLIST[0],
+      // materialreceiveAct: state.MATERIALPACKINGLIST[0],
+      siteName: 'SDK',
+      receiveRequestName: state.queryParams.params.RECEIVEREQUESTNAME,
       user: localStorage.get('userId'),
       commitDate: state.commitDate,
       opcode: state.OpCode
@@ -738,7 +742,7 @@ async function sendToERP() {
   })
 }
 
-function handle(row: any, event: any, column: any) {
+/*function handle(row: any, event: any, column: any) {
   if (areAllNotEmpty(row.ERPFACTORY)) {
     getERPLocation(row.ERPFACTORY)
   } else {
@@ -767,7 +771,7 @@ function handle(row: any, event: any, column: any) {
         confirmButtonText: 'OK'
       })
     })
-}
+}*/
 
 /**************************************************公共方法************************************************/
 function getStorageSpec(value: any) {