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

src/option/warehouse/warehouseRetentionRecord.js

@@ -141,7 +141,7 @@ export const columnList = [
   },
 
   {
-    prop: 'retentionWayName',
+    prop: 'retentionWayNameS',
     label: '滞留方式',
     type: 3,
     values: '',
@@ -160,7 +160,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'scanTypeName',
+    prop: 'scanTypeNameS',
     label: '滞留操作类型',
     type: 3,
     values: '',

src/views/Pricesystem/Price/PriceDelivery.vue

@@ -391,7 +391,7 @@
               />
             </el-form-item>
           </div>
-          <div style="display: flex" v-if="request.dispatchIsUpwardJudgment">
+          <!-- <div style="display: flex" v-if="request.dispatchIsUpwardJudgment">
             <div class="el_flex_h">
               <div>
                 <el-form-item label="向上判断件数">
@@ -422,7 +422,7 @@
                 </el-form-item>
               </div>
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </el-form>
@@ -1205,7 +1205,9 @@ const onLoad = async () => {
           requestInfo.value.leaveBehindMinCost || 0;
 
         // 加算价格
-        if (request.value.dispatchMinCostType == 1) {
+        if (request.value.dispatchMinCostType !=1) {
+
+          console.log(requestInfo.value.additionalCost,'requestInfo.value.additionalCost');
           // 最低加算价格
           form.value.additionalCost = requestInfo.value.additionalCost || 0;
           // 遗留加算价格

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -5741,9 +5741,14 @@ if($useStore.getters && $useStore.getters.permission){
         this.loading = true; //开启加载
         console.log(this.Routid, this.Routid, '存储的ID=====================WDWADAWD');
         console.log('data>>>>>>>>', this.deliverydata);
-        this.deliveryId = this.deliverydata.id; //存储ID
-        let id = this.deliverydata.id;
-        const res = await getDetail(id);
+        if(this.deliverydata.retention){
+          // 滞留跳转进来的
+          this.deliveryId = this.deliverydata.deliveryId; //存储ID
+        }else{
+          // 商配进来的
+          this.deliveryId = this.deliverydata.id; //存储ID
+        }
+        const res = await getDetail(this.deliveryId);
 
         const { code, data } = res.data;
 

src/views/financialsector/Financialse/FinancialDelivery.vue

@@ -353,14 +353,14 @@
 
               <!-- 是否向上判断  -->
 
-              <div v-if="!form.dispatchIsMinCost" class="el_flex_row">
+              <!-- <div v-if="!form.dispatchIsMinCost" class="el_flex_row">
                 <span class="el_table_span">是否向上判断</span>
                 <el-radio-group v-model="form.dispatchIsUpwardJudgment" class="el_Cselect el_fx">
                   <el-radio v-for="item in Upwardjudgment" :key="item.label" :label="item.value">{{
                     item.label
                   }}</el-radio>
                 </el-radio-group>
-              </div>
+              </div> -->
             </div>
           </div>
         </div>

src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue

@@ -49,7 +49,7 @@
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="ElBtnClass">
-                <el-button @click="view(slotProps.scope)">查看</el-button>
+                <el-button @click="view(slotProps.scope)">查看详情</el-button>
               </div>
             </template>
           </template>
@@ -202,7 +202,7 @@ const showdrawer = _flag => {
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
-  test(details.query);
+  onLoad();
 };
 // 实例函数
 const test = val => {};
@@ -225,6 +225,7 @@ const btnsc = val => {
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
   processRowProperty(index, row, details);
+  onLoad();
 };
 /** 表格表头复选框选择 */
 const selectionChange = list => {
@@ -238,10 +239,12 @@ const searchChange = () => {
 // 每页多少条
 const sizeChange = val => {
   details.page.pageSize = val;
+  onLoad();
 };
 /** 页码改变执行的回调 */
 const currentChange = val => {
   details.page.currentPage = val;
+  onLoad();
 };
 // 刷新按钮
 const searchChangeS = () => {
@@ -278,16 +281,16 @@ const onLoad = () => {
     details.data = res.data.data.records;
     details.data.forEach(item => {
       if (item.retentionWay == 1) {
-        item.retentionWayName = '扫描';
+        item.retentionWayNameS = '扫描';
       } else if (item.retentionWay == 2) {
-        item.retentionWayName = '文员';
+        item.retentionWayNameS = '文员';
       }
       if (item.scanType == 1) {
         item.scanType = '包件';
-      } else if (item.scanType == 2) {
+      } else if (item.scanTypeS == 2) {
         item.scanTypeName = '订单';
       } else if (item.scanType == 3) {
-        item.scanTypeName = '托盘';
+        item.scanTypeNameS = '托盘';
       }
     });
     details.page.total = res.data.data.total;
@@ -295,7 +298,17 @@ const onLoad = () => {
   });
 };
 onLoad();
-
+const view = row => {
+  console.log(row, 'row');
+  row.row.retention = true;
+  $router.push({
+    path: '/distribution/deliverylist/distributionDeliveryListedt',
+    query: {
+      data: JSON.stringify(row.row),
+      name: row.row.deliveryId + '-查看配送',
+    },
+  });
+};
 // 页面初始化方法
 </script>