Procházet zdrojové kódy

作业单类型添加

wengyuwen před 4 roky
rodič
revize
488eb01a1f

+ 27 - 25
src/views/warehouseBusiness/inStock/index.vue

@@ -320,8 +320,8 @@
       <el-table-column label="入库件数" align="center" prop="fQty" />
       <!--      <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->
       <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
-      <el-table-column label="入库毛重(kg)" align="center" prop="fGrossweight" />
-      <el-table-column label="入库净重(kg)" align="center" prop="fNetweight" />
+      <el-table-column label="入库毛重(kg)" align="center" width="100" prop="fGrossweight" />
+      <el-table-column label="入库净重(kg)" align="center" width="100" prop="fNetweight" />
       <el-table-column label="车号" align="center" prop="fTruckno" width="100"/>
       <el-table-column label="司机名称" align="center" prop="fDriverName" />
       <el-table-column label="司机电话" align="center" prop="fDriverTel" width="120"/>
@@ -2885,36 +2885,33 @@
             </td>
           </tr>
           <tr>
-            <td
-              width="900"
-              colspan="4"
-              class="zzss"
-              style="font-size: 28px; font-weight: bold;"
-            >
-            </td>
+          <td
+             width="500"
+             colspan="4"
+             style="padding: 6px; font-weight: bold;"
+             class="zzss"
+          >
+              作业类型:{{ businessType }}
+           </td>
+<!--            <td-->
+<!--              width="900"-->
+<!--              colspan="2"-->
+<!--              class="zzss"-->
+<!--              style="font-size: 28px; font-weight: bold;"-->
+<!--            >-->
+<!--            </td>-->
             <td  width="500"v-if="!fBsdates || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间:</td>
 
             <td
               v-else
               width="500"
               colspan="2"
-              style="padding-bottom: 0px; font-weight: bold;"
+              style="padding: 6px; font-weight: bold;"
               class="zzss"
             >
               入库日期:{{ fBsdates }} {{ fBstime.slice(11,19) }}
             </td>
           </tr>
-
-<!--          <tr v-for="(item, index) in Printinglist" :key="index">-->
-<!--            <td width="200">车号</td>-->
-<!--            <td width="200">{{ item.fTruckno }}</td>-->
-<!--            <td width="200">货物品名</td>-->
-<!--            <td width="200" class="zzss">-->
-<!--              {{ item.fGoodsids }}-->
-<!--            </td>-->
-<!--            <td width="200">{{item.fBusinessTypes}}</td>-->
-<!--            <td width="200">{{item.fMarks}}</td>-->
-<!--          </tr>-->
           <tr>
             <td width="200">车号</td>
             <td width="200">货物品名</td>
@@ -2966,12 +2963,11 @@
 <!--            <td colspan="6" class="zzss">&nbsp;</td>-->
 <!--          </tr>-->
           <tr>
+            <td width="290" class="zzss" colspan="2">地址:{{ dataListFaddr }}</td>
+            <td width="290" class="zzss" colspan="2">电话:{{ form.fTel }}</td>
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="290" class="zzss">地址:{{ dataListFaddr }}</td>
-            <td width="290" class="zzss">电话:{{ form.fTel }}</td>
+
           </tr>
         </table>
         <div>
@@ -3048,6 +3044,7 @@ export default {
   },
   data() {
     return {
+      businessType:'',
       dataListFaddr:'',
       information:'',
       informationId:'',
@@ -3939,6 +3936,11 @@ export default {
         }
         this.editDialogVisible_sss = true
         this.fBstime = this.form.fBstime
+        for(let item in this.businessTypeOption){
+          if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
+            this.businessType = this.businessTypeOption[item].dictLabel
+          }
+        }
       } else {
         this.$message.error('请选择需要打印的明细!')
       }

+ 12 - 8
src/views/warehouseBusiness/outStock/index.vue

@@ -2656,18 +2656,17 @@
               width="900"
               colspan="2"
               class="zzss"
-              style="padding-bottom: 0px; font-weight: bold;"
+              style="padding: 6px; font-weight: bold;"
             >车辆类型:{{ fCartype }}
             </td>
-            <td colspan="2">
-
+            <td colspan="2"  class="zzss" style="padding: 6px; font-weight: bold;">作业类型:{{businessType}}
             </td>
             <td  width="500"v-if="!fBsdate || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间:</td>
             <td
               v-else
               width="500"
               colspan="2"
-              style="padding-bottom: 0px; font-weight: bold;"
+              style="padding: 6px; font-weight: bold;"
               class="zzss"
             >
               出库日期:{{ fBsdate }} {{ fBstime.slice(11,19) }}
@@ -2732,12 +2731,11 @@
 <!--            <td colspan="6" class="zzss">&nbsp;</td>-->
 <!--          </tr>-->
           <tr>
+            <td width="290" class="zzss" colspan="2">地址:{{ fAddr }}</td>
+            <td width="290" class="zzss" colspan="2">电话:{{ form.fTel }}</td>
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="290" class="zzss">地址:{{ fAddr }}</td>
-            <td width="290" class="zzss">电话:{{ form.fTel }}</td>
+
           </tr>
         </table>
         <div>
@@ -2816,6 +2814,7 @@ export default {
   },
   data() {
     return {
+      businessType:'',
       fCartype:'',
       fBstime:'',
       browseStatu:false,
@@ -3985,6 +3984,11 @@ export default {
           this.openPrintJobSheet = true
           this.fBstime = this.form.fBstime
         }, 200);
+        for(let item in this.businessTypeOption){
+          if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
+            this.businessType = this.businessTypeOption[item].dictLabel
+          }
+        }
       }
     },
     showEditDialog_ss() {

+ 12 - 6
src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2303,8 +2303,9 @@
               width="900"
               colspan="4"
               class="zzss"
-              style="font-size: 28px; font-weight: bold"
+              style="padding: 6px;font-weight: bold"
             >
+              作业类型:{{businessType}}
             </td>
             <td  width="500"v-if="this.printinglist.length === 0 || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间:111</td>
 
@@ -2312,7 +2313,7 @@
               v-else
               width="500"
               colspan="2"
-              style="padding-bottom: 0px; font-weight: bold;"
+              style="padding: 6px; font-weight: bold;"
               class="zzss"
             >
               调拨日期:{{ parseTime(this.printinglist[0].fBsdate,"{y}-{m}-{d}") }} {{ fBstime.slice(11,19) }}
@@ -2376,12 +2377,11 @@
 <!--            <td colspan="6" class="zzss">&nbsp;</td>-->
 <!--          </tr>-->
           <tr>
+            <td width="290" class="zzss" colspan="2">地址:{{ fAddr }}</td>
+            <td width="290" class="zzss" colspan="2">电话:{{ form.fTel }}</td>
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="290" class="zzss">地址:{{ fAddr }}</td>
-            <td width="290" class="zzss">电话:{{ form.fTel }}</td>
+
           </tr>
         </table>
         <div>
@@ -2692,6 +2692,7 @@ export default {
   },
   data() {
     return {
+      businessType:'',
       fBstime:'',
       fPackagespecs: "",
       editDialogVisible_s: false,
@@ -3743,6 +3744,11 @@ export default {
         this.openPrintJobSheet = true
         this.fBstime = this.form.fBstime
       }, 200);
+      for(let item in this.businessTypeOption){
+        if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
+          this.businessType = this.businessTypeOption[item].dictLabel
+        }
+      }
     },
     // 收款信息
     addCollection() {