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

src/option/basicdata/TripartiteMaterial.js

@@ -21,7 +21,7 @@ export const columnList = [
     values: '',
     width: '150',
     checkarr: [],
-    fixed: true,
+    fixed: false,
     sortable: true,
     head: false,
   },
@@ -32,7 +32,7 @@ export const columnList = [
     values: '',
     width: '150',
     checkarr: [],
-    fixed: true,
+    fixed: false,
     sortable: true,
     head: false,
   },
@@ -52,18 +52,18 @@ export const columnList = [
       value:'2'
     },
   ],
-    fixed: true,
+    fixed: false,
     sortable: true,
     head: false,
   },
   {
     prop: 'materielName',
     label: '物料',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
-    fixed: true,
+    fixed: false,
     sortable: true,
     head: false,
   },
@@ -74,7 +74,7 @@ export const columnList = [
     values: '',
     width: '150',
     checkarr: [],
-    fixed: true,
+    fixed: false,
     sortable: true,
     head: false,
   },
@@ -85,7 +85,7 @@ export const columnList = [
     values: '',
     width: '150',
     checkarr: [],
-    fixed: true,
+    fixed: false,
     sortable: true,
     head: false,
   },
@@ -96,7 +96,7 @@ export const columnList = [
     values: '',
     width: '150',
     checkarr: [],
-    fixed: true,
+    fixed: false,
     sortable: true,
     head: false,
   },

src/views/Pricesystem/ListOfPriceSystems.vue

@@ -645,7 +645,12 @@ const deletetails = row => {
 const handleClient = async row => {
   try {
     details.loadingObj.pageLoading = true;
-    const res = await $_getpriceTemplate({ brandId: row.brandId });
+    let _data={
+      brandId: row.brandId,
+      current:1,
+      size:500,
+    }
+    const res = await $_getpriceTemplate(_data);
 
     const { code, data } = res.data;
 

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -117,9 +117,9 @@
         </el-table>
       </el-row>
       <!-- 零担数据没有该模块 -->
-      <template v-if="Number($route.query.isZero) === 0">
+  
         <h3>包件信息</h3>
-        <div class="plck">
+        <div class="plck"  v-if="Number($route.query.isZero) === 0">
           <el-button type="primary" @click="allhandleQRCode">批量查看二维码</el-button>
           <el-button type="primary" @click="handleMaterialList()">补充物料信息</el-button>
         </div>
@@ -135,7 +135,7 @@
           @selectCheck="selectsc"
           @selection="selectionChange"
         >
-          <template #default="slotProps">
+          <template #default="slotProps" v-if="Number($route.query.isZero) === 0">
             <template v-if="slotProps.scope.column.label === '物料维护状态'">
               <el-tag :class="slotProps.scope.row.materialId ? 'green' : 'red'">{{
                 slotProps.scope.row.materialCodeMaintainStatus
@@ -195,7 +195,7 @@
             </el-pagination>
           </div>
         </el-row>
-      </template>
+  
       <!-- 物料选择模块 -->
       <el-dialog
         :title="titleMaterial"
@@ -1431,7 +1431,7 @@ export default {
       );
     },
     async onLoadOwn(page, params = {}) {
-      if (Number(this.$route.query.isZero) === 1) return;
+      // if (Number(this.$route.query.isZero) === 1) return;
 
       try {
         this.loadingObj.tableLoading = true;