Merge remote-tracking branch 'origin/master'

src/views/warehouseBusiness/inStock/index.vue

@@ -855,45 +855,54 @@
             type="primary"
             :disabled="browseStatus"
             @click.prevent="addRelevant(10)"
+            size="small"
           >新行
           </el-button>
           <el-button
             :disabled="browseStatus"
             type="primary"
             @click="submitForm(2)"
+            size="small"
           >保 存</el-button
           >
         </div>
         <div>
           <el-button
+            size="small"
             @click="
               detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
             "
           >{{ detailsHidden ? '隐藏' : '展开' }}
           </el-button
           >
-          <el-button type="info" :disabled="browseStatus" prop="打印" @click="showEditDialog_sss"
+          <el-button  size="small" type="info" :disabled="browseStatus" prop="打印" @click="showEditDialog_sss"
           >作业单
           </el-button>
-          <el-button @click="discharge" :disabled="browseStatus">卸货</el-button>
+          <el-button size="small" @click="discharge" :disabled="browseStatus">卸货完成</el-button>
           <el-button
+            size="small"
             :disabled="dataListSelection.length <= 0 || browseStatus"
             @click.prevent="creditClick"
           >入库确认
           </el-button>
           <el-button
+            size="small"
             :disabled="dataWithdrawList.length <= 0 || browseStatus"
             @click.prevent="withdrawClick"
           >撤回入库
           </el-button
           >
-          <el-button type="success" :disabled="browseStatus" prop="打印" @click="showEditDialog_ss"
+          <el-button size="small" type="success" :disabled="browseStatus" prop="打印" @click=""
+          >打印吊牌
+          </el-button>
+          <el-button size="small" type="success" :disabled="browseStatus" prop="打印" @click="showEditDialog_ss"
           >收货单
           </el-button>
-          <el-button type="warning" :disabled="browseStatus" prop="打印" @click="showEditDialog_s"
+          <el-button size="small" type="warning" :disabled="browseStatus" prop="打印" @click="showEditDialog_s"
           >入库单
           </el-button>
           <el-button
+            size="small"
             :disabled="browseStatus"
             style="background-color: #008000; color: #fff"
             @click="submitForm(6)"
@@ -993,6 +1002,7 @@
           <template slot-scope="scope">
             <el-select v-model="scope.row.fBusinessType"
                        filterable
+                       size="small"
                        :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
                        :remote-method="kqhouseRemoteMethod"
                        placeholder="请选择商品属性"
@@ -1383,6 +1393,7 @@
       >
         <div>
           <el-button
+            size="small"
             type="primary"
             :disabled="browseStatus"
             @click.prevent="addRelevt()"
@@ -1495,6 +1506,7 @@
       >
         <div>
           <el-button
+            size="small"
             type="primary"
             :disabled="browseStatus"
             @click.prevent="addCollection()"
@@ -1503,9 +1515,9 @@
           <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
           >删除
         </el-button> -->
-          <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
+          <el-button type="primary" size="small" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
           <!-- <el-button @click.prevent="addAgreement()" type="warning">仓储费协议</el-button> -->
-          <el-button @click.prevent="addAgreement()" :disabled="browseStatus" type="danger"
+          <el-button size="small" @click.prevent="addAgreement()" :disabled="browseStatus" type="danger"
           >作业费协议</el-button
           >
         </div>
@@ -1796,10 +1808,11 @@
             type="primary"
             :disabled="browseStatus"
             @click.prevent="addpayment()"
+            size="small"
           >新行
           </el-button>
-          <el-button type="primary" @click="submitForm(2)" :disabled="browseStatus">保 存</el-button>
-          <el-button type="danger" @click.prevent="addAgreements()" :disabled="browseStatus"
+          <el-button type="primary" size="small" @click="submitForm(2)" :disabled="browseStatus">保 存</el-button>
+          <el-button type="danger" size="small" @click.prevent="addAgreements()" :disabled="browseStatus"
           >作业费协议</el-button>
         </div>
         <div style="font-size: 18px">付款信息</div>

src/views/warehouseBusiness/outStock/index.vue

@@ -753,7 +753,7 @@
         <div style="display: flex">
           <el-button @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">{{ detailsHidden ? "隐藏" : "展开" }}</el-button>
           <el-button type="info" :disabled="printinglist.length <= 0 || browseStatus" prop="打印" @click="printJobSheet">作业单</el-button>
-          <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货</el-button>
+          <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货完成</el-button>
           <el-button
             :disabled="dataListSelection.length <= 0 || browseStatus"
             @click.prevent="creditClick"