Merge branch 'dev' of git.echepei.com:zhujiawei/Warehouse_management_ui into dev

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1316,11 +1316,21 @@
                 header-align="center"
                 align="center"
                 label="操作"
-                width="130px"
+                width="160px"
                 fixed="right"
             >
               <template slot-scope="scope">
                 <el-button
+                  type="text"
+                  size="small"
+                  disabled
+                >提交</el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  disabled
+                >撤销</el-button>
+                <el-button
                     :disabled="browseStatus || scope.row.fBillstatus > 30"
                     type="text"
                     @click.native.prevent="fixRow(scope.row, scope.$index)"
@@ -5021,6 +5031,7 @@
         <el-button @click="print_khrkd = false">取消 </el-button>
       </span>
     </el-dialog>
+<!--    卸货存档入库单-->
     <el-dialog
         :visible.sync="print_xhcdrkd"
         width="70%"
@@ -5060,6 +5071,7 @@
             <div>毛重：{{ (form.fPlangrossweight / 1000).toFixed(2) }}</div>
           </div>
           <div>
+            <div>报关单号：{{ form.fCustomno }}</div>
             <div>清单号：{{ form.fCustomsdeclartion }}</div>
             <div>存放仓库：{{ stockName }}</div>
             <div>净重：{{ (form.fPlannetweight / 1000).toFixed(2) }}</div>
@@ -5090,7 +5102,8 @@
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
-              <td colspan="3">合计：</td>
+              <td colspan="2">合计：</td>
+              <td>{{ allfQty }}</td>
               <td>{{ allfQty }}</td>
               <td></td>
               <td></td>

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -2246,12 +2246,12 @@ export default {
             if (this.form.fBillstatus < 6) {
               actId = '410'
               this.$refs.ApprovalComments.init(form.fId,status,actId,this.form.fMblno)
-            } else if (this.form.moneyStatus != null && this.form.moneyStatus < 6) {
-              actId = '460'
-              this.$refs.ApprovalComments.init(form.fId,status,actId)
-            } else {
+            } else if(this.form.fBillstatus > 6 && this.form.fBillstatus < 11){
               actId = '420'
               this.$refs.ApprovalComments.init(form.fId, status,actId)
+            }else if (this.form.fBillstatus == 11 && this.form.moneyStatus != null && this.form.moneyStatus < 6) {
+              actId = '460'
+              this.$refs.ApprovalComments.init(form.fId,status,actId)
             }
           })
         } else {