提交出入库代码

src/views/warehouseBusiness/inStock/index.vue

@@ -2255,7 +2255,7 @@
             <td width="200" colspan="2" class="zzss">
               联系人：{{ form.fContacts }}
             </td>
-            <td width="200" colspan="3" class="zzss">电话：{{ fDriverTel }}</td>
+            <td width="200" colspan="3" class="zzss">电话：{{ form.fTel }}</td>
           </tr>
           <tr>
             <td width="100" border="1">提单号</td>
@@ -2268,9 +2268,9 @@
           </tr>
           <tr>
             <td width="100">{{ form.fMblno }}</td>
-            <td width="100">{{ fGoodsids }}</td>
-            <td width="100">{{ fCntrtype }}</td>
-            <td width="100"></td>
+            <td width="100">{{ form.fProductName }}</td>
+            <td width="100">{{ dataList.fCntrtype }}</td>
+            <td width="100">{{ form.fMarks }}</td>
             <td width="100">包</td>
             <td width="100">吨</td>
             <td width="100">{{ fPackagespecs }}</td>
@@ -2296,9 +2296,9 @@
           <tr>
             <td width="100" colspan="2">合计：</td>
             <td width="100">{{ fCntqty }}</td>
-            <td width="100">{{ fGrossweight }}</td>
+            <td width="100">{{ fGrossweight.toFixed(2) }}</td>
             <td width="100">{{ fPlanqty }}</td>
-            <td width="100">{{ fNetweight }}</td>
+            <td width="100">{{ fNetweight.toFixed(2) }}</td>
             <td width="100">{{ fQty }}</td>
           </tr>
           <tr>
@@ -2397,7 +2397,8 @@
             <td>司机签字:</td>
             <td></td>
             <td colspan="2">司机电话:</td>
-            <td colspan="2">{{ fDriverTel }}</td>
+            <td colspan="2" v-if="dataList.length !== 0">{{ dataList[0].fDriverTel }}</td>
+            <td colspan="2" v-else>1</td>
           </tr>
           <tr>
             <td>制单人:</td>
@@ -2414,7 +2415,7 @@
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
             <td width="290" class="zzss">地址：{{ fAddr }}</td>
-            <td width="290" class="zzss">电话：{{ fDriverTel }}</td>
+            <td width="290" class="zzss">电话：{{ form.fTel }}</td>
           </tr>
           <!-- </div> -->
         </table>

src/views/warehouseBusiness/outStock/index.vue

@@ -263,7 +263,7 @@
           <span v-if="scope.row.fItemsStatus === 1">计划</span>
           <span v-if="scope.row.fItemsStatus === 2">卸货中</span>
           <span v-if="scope.row.fItemsStatus === 3">已装货</span>
-          <span v-if="scope.row.fItemsStatus === 4">已入库</span>
+          <span v-if="scope.row.fItemsStatus === 4">已出库</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -1002,7 +1002,7 @@
               v-model="scope.row.fIsPass"
               placeholder="是否放行"
               clearable
-              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
+              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 40"
               style="width: 80%"
             >
               <el-option
@@ -1940,12 +1940,13 @@
           </tr>
           <tr>
             <td width="100">{{ form.fMblno }}</td>
-            <td width="100">{{ fGoodsids }}</td>
-            <td width="100">{{ fCntrtype }}</td>
-            <td width="100"></td>
+            <td width="100">{{ form.fProductName }}</td>
+            <td width="100">{{ dataList.fCntrtype }}</td>
+            <td width="100">{{ form.fMarks }}</td>
             <td width="100">包</td>
             <td width="100">吨</td>
-            <td width="100"></td>
+            <td width="100" v-if="dataList.length !== 0">{{ dataList[0].fPackagespecs }}</td>
+            <td width="100" v-else></td>
           </tr>
           <tr>
             <td width="100">序号</td>
@@ -1990,7 +1991,7 @@
               {{ form.createBy }}
             </td>
             <td width="100" colspan="2" class="zzss" style="border: none">
-              仓管员：{{ form.fContacts }}
+              仓管员：{{ form.fStorekeeper }}
             </td>
           </tr>
           <tr style="border: none">
@@ -2019,7 +2020,7 @@
           id="print_area"
           class="biaoge zzss"
           border="1"
-          style="border-collapse: collapse; border: none;margin-top;100px;"
+          style="border-collapse: collapse; border: none;margin-top:100px;"
         >
           <tr>
             <td
@@ -2161,7 +2162,9 @@
             <td>司机签字：</td>
             <td></td>
             <td>电话</td>
-            <td>{{ form.fTel }}</td>
+            <td colspan="1" v-if="dataList.length !== 0">{{ dataList[0].fDriverTel }}</td>
+            <td colspan="1" v-else>1</td>
+
             <td colspan="2" rowspan="2">
               确认货物数量无误，包装于货物完好！<br />出库盖好篷布，如有违背责任自负<br />装卸工是否收小费
             </td>
@@ -3326,6 +3329,7 @@ export default {
     // 出库确认
     creditClick() {
       this.$refs["form"].validate((valid) => {
+        console.log(this.dataListSelection[0].fIsPass)
         for (let warehouseCr in this.dataListSelection) {
           if (this.dataListSelection[warehouseCr].fBillstatus === 10) {
             this.$message.error("请先打印作业单");
@@ -3342,6 +3346,9 @@ export default {
           } else if (!this.dataListSelection[warehouseCr].fQty) {
             this.$message.error("请维护出库件数");
             return false;
+          } else if (this.dataListSelection[warehouseCr].fIsPass == this.releaseList.dictValue !== 'T') {
+            this.$message.error("请放行才能出库");
+            return false;
           }
         }
         if (valid) {