소스 검색

修改bug

qukaidi 3 년 전
부모
커밋
9181e551a9

+ 2 - 2
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -5881,8 +5881,8 @@
           style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作:{{ form.createBy }}</div>-->
-          <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
-          <div style="width: 100px">叉车:</div>
+          <div>制单人:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
+          <div style="width: 100px">审核人:</div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">

+ 6 - 2
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -2883,6 +2883,7 @@
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
             <tr>
               <td style="height: 20px">箱号</td>
+              <td>品名</td>
               <td>现存库区</td>
               <td>件数</td>
               <td v-if="radio == 1">毛重(吨)</td>
@@ -2893,6 +2894,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td style="height: 20px">{{ item.fCntrno }}</td>
+              <td>{{ item.fGoodsids}}</td>
               <td>{{ item.fOrgwarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
               <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
@@ -2903,7 +2905,9 @@
               <td>{{ item.fWarehouseInformation }}</td>
             </tr>
             <tr>
-              <td colspan="2" style="height: 20px">合 计</td>
+              <td colspan="1" style="height: 20px">合 计</td>
+              <td>-</td>
+              <td>-</td>
               <td>{{allfQty}}</td>
               <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
@@ -2913,7 +2917,7 @@
             </tr>
             <tr>
               <td style="height: 20px">备注</td>
-              <td colspan="5">{{ form.remark }}</td>
+              <td colspan="6">{{ form.remark }}</td>
             </tr>
           </table>
         </div>

+ 16 - 2
src/views/kaihe/containerNews/boxInformation/index.vue

@@ -453,7 +453,7 @@
         <!--        </el-table-column>-->
         <el-table-column prop="fCntrstatus" label="箱状态" align="center">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.fCntrstatus" style="width: 80%" placeholder="请选择箱状态">
+            <el-select v-model="scope.row.fCntrstatus" style="width: 80%" placeholder="请选择箱状态" @change="fCntrstatusChange(scope.row.fCntrstatus)">
               <el-option v-for="dict in cntrstatusOptions" :key="dict.dictValue" :label="dict.dictLabel"
                 :value="dict.dictValue" />
             </el-select>
@@ -461,7 +461,7 @@
         </el-table-column>
         <el-table-column prop="fUpdateef" label="空重" align="center">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.fUpdateef" style="width: 80%" placeholder="请选择空重">
+            <el-select v-model="scope.row.fUpdateef" style="width: 80%" placeholder="请选择空重" @change="fUpdateefChange(scope.row.fUpdateef)">
               <el-option v-for="dict in updateEFOptions" :key="dict.dictValue" :label="dict.dictLabel"
                 :value="dict.dictValue" />
             </el-select>
@@ -1145,6 +1145,20 @@ export default {
         }
       });
     },
+    fCntrstatusChange(row) {
+      this.boxLeadIn.forEach(e => {
+        if (!e.fCntrstatus) {
+          e.fCntrstatus = row
+        }
+      });
+    },
+    fUpdateefChange(row) {
+      this.boxLeadIn.forEach(e => {
+        if (!e.fUpdateef) {
+          e.fUpdateef = row
+        }
+      });
+    },
     //重置列表
     delRow() {
       this.data = {