Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -347,7 +347,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'reservationStockListNum',
+          prop: 'inventoryNub',
           label: '配送库存品件数',
           type: 1,
           values: '',

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -237,7 +237,7 @@ export default {
         },
         {
           prop: 'kind',
-          label: '配送种类1',
+          label: '配送种类',
           type: 3,
           values: '',
           width: '180',

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -53,7 +53,7 @@
           <span>计划包件件数：{{deliverydata.deliveryNumber}} </span>
         </el-col>
         <el-col :xl="5" :lg="7" :md="8" :sm="24">
-          <span>计划库存品数：{{deliverydata.reservationStockListNum}} </span>
+          <span>计划库存品数：{{deliverydata.inventoryNub}} </span>
         </el-col>
         <el-col :xl="5" :lg="7" :md="8" :sm="24">
           <span>装车件数：{{deliverydata.scannedNumber}} </span>
@@ -102,8 +102,8 @@
                   <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看</el-button>
                   <!--              <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>-->
                   <el-button type="primary" text icon="el-icon-view" @click="handleOne(row)" v-if="deliverydata.deliveryNumber > deliverydata.loadNub && row.signingStatus=='未签收'">一 键 装 车</el-button>
-                  <el-button type="primary" text icon="el-icon-view" @click="handleSign(row)" v-if="row.signingStatus=='未签收'">复 核 签 收</el-button>
+                  <el-button type="primary" text icon="el-icon-view" @click="handleSign(row)" v-if="row.signingStatus=='未签收' && row.driverSigning=='已签收' ">复 核 签 收</el-button>
-                  <el-button type="primary" text icon="el-icon-view" @click="handleSignone(row)" v-if="row.signingStatus=='已签收' || row.driverSigning=='已签收' ">一 键 签 收</el-button>
+                  <el-button type="primary" text icon="el-icon-view" @click="handleSignone(row)" v-if="row.signingStatus=='未签收' && row.driverSigning=='未签收' ">一 键 签 收</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -236,7 +236,7 @@ export default {
         },
         {
           prop: 'kind',
-          label: '配送种类1',
+          label: '配送种类',
           type: 3,
           values: '',
           width: '180',

src/views/distribution/signdetail/distributionSigndetaledt.vue

@@ -40,10 +40,6 @@
       </el-row>
       <el-divider>包 件 列 表</el-divider>
 
-
-
-
-
           <!-- 列表模块 -->
           <el-table ref="table" v-loading="loading"
                     @selection-change="selectionChange"
@@ -69,95 +65,22 @@
             <!-- 分页模块 -->
             <el-pagination align="right"
                            background
-                           @size-change="psizeChange"
+                           @size-change="wsizeChange"
-                           @current-change="pcurrentChange"
+                           @current-change="wcurrentChange"
-                           :current-page="packpage.currentPage"
+                           :current-page="wpage.currentPage"
                            :page-sizes="[10, 20, 30, 40, 50, 100]"
-                           :page-size="packpage.pageSize"
+                           :page-size="wpage.pageSize"
                            layout="total, sizes, prev, pager, next, jumper"
-                           :total="packpage.total">
+                           :total="wpage.total">
             </el-pagination>
           </div>
 
 
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
-          <!-- 分页模块 -->
-          <!--          <el-pagination align="right"-->
-          <!--                         background-->
-          <!--                         @size-change="sizeChange"-->
-          <!--                         @current-change="currentChange"-->
-          <!--                         :current-page="page.currentPage"-->
-          <!--                         :page-sizes="[10, 20, 30, 40, 50, 100]"-->
-          <!--                         :page-size="page.pageSize"-->
-          <!--                         layout="total, sizes, prev, pager, next, jumper"-->
-          <!--                         :total="page.total">-->
-          <!--          </el-pagination>-->
         </div>
       </el-row>
-      <!-- 表单模块 -->
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="wrapdata"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-          <template v-for="(item,index) in wrapoption.column">
-            <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             align="center"
-                             :width="item.width"
-                             :key="index">
-            </el-table-column>
-          </template>
-        </el-table>
-        <div class="avue-crud__pagination" style="width:100%">
-          <!-- 分页模块 -->
-          <el-pagination align="right"
-                         background
-                         @size-change="wsizeChange"
-                         @current-change="wcurrentChange"
-                         :current-page="wpage.currentPage"
-                         :page-sizes="[10, 20, 30, 40, 50, 100]"
-                         :page-size="wpage.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="wpage.total">
-          </el-pagination>
-        </div>
-        <!-- 表单按钮 -->
-        <!--        <template #footer>-->
-        <!--          <span v-if="!view" class="dialog-footer">-->
-        <!--            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>-->
-        <!--            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
-        <!--          </span>-->
-        <!--        </template>-->
-      </el-dialog>
 
-<!--      <el-dialog :title="'签收'"-->
-<!--                 v-model="signBox"-->
-<!--                 width="45%"-->
-<!--                 append-to-body>-->
-<!--        <avue-form :option="signoption"-->
-<!--                   v-model="signform"-->
-<!--                   :data="signdata"-->
-<!--                   ref="signform"-->
-<!--        >-->
-<!--        </avue-form>-->
-<!--        <div style="bottom: 7%;margin-left: 500px;width: 50%">-->
-<!--          <div style="width: 100%">-->
-<!--            <el-button  type="primary" @click="submitForm" style="margin-right: 20%" >确定</el-button>-->
-<!--            <el-button  type="primary" @click="cancellation" >取消</el-button>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </el-dialog>-->
 
     </div>
   </basic-container>
@@ -926,7 +849,6 @@ export default {
       packdetail(id).then(res => {
         console.log("res.data>>>>>>>>>>>>",res.data.data);
         const data = res.data.data
-        //this.orderdata = data
         this.wpage.total = data.total;
         this.packdata = data.records