Merge remote-tracking branch 'origin/main'

# Conflicts:
#	admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue

admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue

@@ -1,5 +1,45 @@
 <template>
   <div class="bill-edit" v-loading="loading">
+    <div style="display: flex;align-items: center;">
+      <el-form ref="form"  style="flex: 1;margin-top: 25px;" :model="form" :rules="rules"
+        label-width="80px" >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="单据编号" prop="billNumber" >
+              <bill-number-input ref="billInput" v-model="form.billNumber" type="RK" :disabled="!!form.id"></bill-number-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单据时间" prop="billDate">
+              <el-date-picker clearable v-model="form.billDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择单据时间" style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="货主" prop="custId">
+              <el-select v-model="form.custId" filterable placeholder="请输入货主名称" style="width: 100%" clearable
+                @change="setCustDetail">
+                <el-option v-for="item in custList" :key="item.id" :label="item.custName" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="订单选择" prop="orderId">
+              <el-input v-model="form.orderNo" placeholder="订单编号" readonly style="width: 100%">
+                <el-button slot="append" icon="el-icon-search" @click="openOrderSelect"></el-button>
+                <el-button v-if="form.orderId" slot="append" icon="el-icon-close" @click="clearOrderSelect"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div v-if="!hideEdit" style="margin-bottom: 10px">
+      <el-button type="primary" plain @click="addBillTable()">添加入库单</el-button>
+      <el-button type="danger" plain @click="deleteSelectedBill()">删除选中项</el-button>
+    </div>
     <div v-if="loading" style="flex: 1;"></div>
     <el-table v-else ref="table" style="flex: 1;" highlight-current-row height="70vh" :data="form.ckBillCargos" @selection-change="selectionChange"
       border :row-style="rowStyle">
@@ -162,41 +202,8 @@
       </el-table-column>
     </el-table>
     <div style="display: flex;align-items: center;">
-      <el-form ref="form"  style="flex: 1;margin-top: 25px;" :model="form" :rules="rules"
+      <div style="flex: 1;"></div>
-        label-width="80px" >
+      <div style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="单据编号" prop="billNumber" >
-              <bill-number-input ref="billInput" v-model="form.billNumber" type="RK" :disabled="!!form.id"></bill-number-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单据时间" prop="billDate">
-              <el-date-picker clearable v-model="form.billDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择单据时间" style="width: 100%">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="供应商" prop="custId">
-              <el-select v-model="form.custId" filterable placeholder="请输入供应商名称" style="width: 100%" clearable
-                @change="setCustDetail">
-                <el-option v-for="item in custList" :key="item.id" :label="item.custName" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="订单选择" prop="orderId">
-              <el-input v-model="form.orderNo" placeholder="订单编号" readonly style="width: 100%">
-                <el-button slot="append" icon="el-icon-search" @click="openOrderSelect"></el-button>
-                <el-button v-if="form.orderId" slot="append" icon="el-icon-close" @click="clearOrderSelect"></el-button>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div style="margin-left: 20px;">
         <el-button v-if="!readonly" type="primary" plain
           style="margin-right: 20px;" @click="confirm">{{ form.billStatus == 1 ? '单据撤销' : '单据确认' }}</el-button>
         <el-button @click="cancel">取消</el-button>

admin/src/views/ck/ckwarehouse/index.vue

@@ -105,11 +105,8 @@
     <!-- 添加或修改仓库入库管理对话框 -->
     <el-dialog :title="title" :close-on-click-modal="false"
       :visible.sync="open" fullscreen append-to-body>
-      <div slot="title" v-if="!hideEdit">
+      
-        <el-button type="primary" plain @click="$refs.billEdit.addBillTable()">添加入库单</el-button>
+      <BillEdit ref="billEdit" :hideEdit="hideEdit" @close="handleClose" @refresh="refreshList"></BillEdit>
-        <el-button type="danger" plain @click="$refs.billEdit.deleteSelectedBill()">删除选中项</el-button>
-      </div>
-      <BillEdit ref="billEdit" @close="handleClose" @refresh="refreshList"></BillEdit>
     </el-dialog>
   </el-container>
 </template>
@@ -563,7 +560,7 @@ export default {
 }
 
 ::v-deep .el-dialog__body {
-  padding-top: 20px;
+  padding-top: 0px !important;
   flex: 1;
   overflow: hidden;
 }