Merge branch 'blueBranch' into testToMerge

src/HDrpManagement/logistics/details/tabs/logisticsBox/add.vue

@@ -26,73 +26,17 @@
         <el-row :gutter="10">
           <el-col :span="setcol">
             <!-- 产品编码、产品名称、品号、型号、规格尺寸、装箱数量 -->
-            <el-table
-              :data="tableData"
-              size="small"
-              border>
-              <el-table-column
-                  prop="billno"
-                  :label="$t(`发货单号`)"
-                  width="180">
-              </el-table-column>
-              <el-table-column
-                prop="itemno"
-                :label="$t(`产品编码`)"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="itemname"
-               :label="$t('产品名称')"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="model"
-                :label="$t('型号')"
-                width="180">
-              </el-table-column>
-              <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
-                <template slot-scope="scope">
-                  <p>
-                    <span>{{ scope.row.caliber || '--'}}</span>
-                  </p>
-                </template>
-              </el-table-column>
-              <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
-                <template slot-scope="scope">
-                  {{tool.nominalPressureSet(scope.row.nominalpressure)}}
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="spec"
-                :label="$t(`规格尺寸`)"
-                v-if="siteid != 'HY' && siteid != 'YOSTEST1'"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="qty"
-                :label="$t(`装箱数量`)"
-                width="200">
-                <template slot-scope="scope">
-                  <el-input v-model.number="scope.row.qty" type="number" size="mini"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="remarks"
-                :label="$t('备注')"
-                min-width="250">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.remarks" size="mini"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="$t('操作')"
-                fixed="right"
-                width="90">
-                <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="deleteRow(scope.row)">{{$t('删 除')}}</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+            <tableDetail :layout="tablecols" :data="tableData" :opwidth="200" :custom="true" fixedName="operation">
+              <template v-slot:customcol="scope">
+                <div v-if="scope.column.columnname === 'nominalpressure'" >
+                  {{tool.nominalPressureSet(scope.column.data[scope.column.columnname])}}
+                </div>
+                <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname ==='operation'?scope.column.data[scope.column.columnname] : '--'}}</div>
+              </template>
+              <template v-slot:opreation="scope">
+                <el-button type="text" size="mini" @click="deleteRow(scope.data)">{{$t('删 除')}}</el-button>
+              </template>
+            </tableDetail>
           </el-col>
           <el-col :span="24 - setcol">
             <logisticsCanUseProduct ref="logislist" :sa_logistics_boxid="0" @onConfirm="onConfirm" :addList="tableData">
@@ -122,6 +66,7 @@ export default {
       },
       setcol:24,
       tableData:[],
+      tablecols:[],
       rules:{
         boxnum: [
           { required: true, message: this.$t('请输入箱码'), trigger: 'blur' },
@@ -204,6 +149,9 @@ export default {
       })
       this.$refs.logislist.listData()
     }
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).packedProductsAddTable.tablecols
   }
 }
 

src/HDrpManagement/logistics/details/tabs/logisticsBox/edit.vue

@@ -26,60 +26,17 @@
         <el-row :gutter="10">
           <el-col :span="setcol">
             <!-- 产品编码、产品名称、品号、型号、规格尺寸、装箱数量 -->
-            <el-table
-              :data="tableData"
-              size="small"
-              border>
-              <el-table-column
-                  prop="billno"
-                  :label="$t(`发货单号`)"
-                  width="180">
-              </el-table-column>
-              <el-table-column
-                prop="itemno"
-                :label="$t(`产品编码`)"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="itemname"
-               :label="$t('产品名称')"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="model"
-                :label="$t('型号')"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="spec"
-                :label="$t(`规格尺寸`)"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="qty"
-                :label="$t(`装箱数量`)"
-                width="200">
-                <template slot-scope="scope">
-                  <el-input v-model.number="scope.row.qty" type="number" size="mini"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="remarks"
-                :label="$t('备注')"
-                min-width="250">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.remarks" size="mini"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                :label="$t('操作')"
-                fixed="right"
-                width="90">
-                <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="deleteRow(scope.row)">{{$t('删 除')}}</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+            <tableDetail :layout="tablecols" :data="tableData" :opwidth="200" :custom="true" fixedName="operation">
+              <template v-slot:customcol="scope">
+                <div v-if="scope.column.columnname === 'nominalpressure'" >
+                  {{tool.nominalPressureSet(scope.column.data[scope.column.columnname])}}
+                </div>
+                <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname ==='operation'?scope.column.data[scope.column.columnname] : '--'}}</div>
+              </template>
+              <template v-slot:opreation="scope">
+                <el-button type="text" size="mini" @click="deleteRow(scope.data)">{{$t('删 除')}}</el-button>
+              </template>
+            </tableDetail>
           </el-col>
           <el-col :span="24 - setcol">
             <logisticsCanUseProduct ref="logislist" :sa_logistics_boxid="this.data.sa_logistics_boxid" @onConfirm="onConfirm" :addList="delList" type="edit">
@@ -106,7 +63,8 @@ export default {
       form:{},
       setcol:24,
       tableData:[],
-      delList:[]
+      delList:[],
+      tablecols:[]
     }
   },
   components:{
@@ -209,6 +167,9 @@ export default {
       })
       this.tableData = res.data
     }
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).packedProductsAddTable.tablecols
   }
 }
 

src/HDrpManagement/logistics/details/tabs/logisticsBox/logisticsBoxmx.vue

@@ -1,54 +1,13 @@
 <template>
   <div>
-   <el-table
-      :data="tableData"
-      size="small"
-      :loading="loading"
-      border>
-      <el-table-column
-        prop="itemno"
-        :label="$t(`产品编码`)"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="itemname"
-       :label="$t('产品名称')"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="model"
-        :label="$t('型号')"
-        width="180">
-      </el-table-column>
-     <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
-       <template slot-scope="scope">
-         <p>
-           <span>{{ scope.row.caliber }}</span>
-         </p>
-       </template>
-     </el-table-column>
-     <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
-       <template slot-scope="scope">
-         {{tool.nominalPressureSet(scope.row.nominalpressure)}}
-       </template>
-     </el-table-column>
-      <el-table-column
-        prop="spec"
-        :label="$t(`规格尺寸`)"
-        v-if="siteid != 'HY' && siteid != 'YOSTEST1'"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="qty"
-        :label="$t(`装箱数量`)"
-        width="200">
-      </el-table-column>
-      <el-table-column
-        prop="remarks"
-        :label="$t('备注')"
-        min-width="250">
-      </el-table-column>
-  </el-table>
+    <tableDetail :layout="tablecols" :data="tableData" :opwidth="200" :custom="true">
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'nominalpressure'" >
+          {{tool.nominalPressureSet(scope.column.data[scope.column.columnname])}}
+        </div>
+        <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname ==='operation'?scope.column.data[scope.column.columnname] : '--'}}</div>
+      </template>
+    </tableDetail>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
         background
@@ -65,7 +24,9 @@
 </template>
 
 <script>
+import DetailTable from "@/HManagement/clueManage/m_activity/modules/detailTable";
 export default {
+  components: {DetailTable},
   data () {
     return {
       params:{
@@ -81,6 +42,7 @@ export default {
         }
       },
       tableData:[],
+      tablecols:[],
       total:0,
       currentPage:0,
       loading:false,
@@ -113,6 +75,7 @@ export default {
   },
   mounted () {
     // this.listData()
+    this.tablecols = this.tool.tabelCol(this.$route.name).packedProductsTable.tablecols
   }
 }
 

src/template/logisticsCanUseProduct/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="flex-align-center flex-between mt-10">
-      <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" :placeholder="`${$t(`产品名称`)},${$t(`编号`)}`" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>
+      <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" :placeholder="`${$t(`产品名称`)},${$t(`编号`)},erp${$t(`编号`)}`" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>
       <div style="display:flex">
         <slot name="allBtn" :data="total"></slot>
         <div>
@@ -9,59 +9,14 @@
         </div>
       </div>
     </div>
-    <el-table
-      :data="tableData"
-      style="width: 100%"
-      size="small"
-      border
-      @selection-change="selectionChange">
-      <el-table-column
-        type="selection"
-        width="55">
-      </el-table-column>
-      <el-table-column
-          prop="billno"
-          :label="$t(`发货单号`)"
-          width="180">
-      </el-table-column>
-      <el-table-column
-        prop="itemno"
-        :label="$t(`产品编码`)"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="itemname"
-       :label="$t('产品名称')"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="model"
-        :label="$t('型号')"
-        width="180">
-      </el-table-column>
-      <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
-        <template slot-scope="scope">
-          <p>
-            <span>{{ scope.row.caliber || '--'}}</span>
-          </p>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
-        <template slot-scope="scope">
-          {{tool.nominalPressureSet(scope.row.nominalpressure)}}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="spec"
-        v-if="siteid != 'HY' && siteid != 'YOSTEST1'"
-        :label="$t(`规格尺寸`)"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="qty"
-        :label="$t(`装箱数量`)">
-      </el-table-column>
-    </el-table>
+    <tableDetail :checkbox="true" :layout="tool.tabelCol($route.name).packedProductsAddTable.tablecols.splice(0,tool.tabelCol($route.name).packedProductsAddTable.tablecols.length - 1)" @selectionChange="selectionChange" :data="tableData" :opwidth="200" :custom="true">
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'nominalpressure'" >
+          {{tool.nominalPressureSet(scope.column.data[scope.column.columnname])}}
+        </div>
+        <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname ==='operation'?scope.column.data[scope.column.columnname] : '--'}}</div>
+      </template>
+    </tableDetail>
 <!--    <div style="margin-top:16px;text-align:right">-->
 <!--      <el-pagination-->
 <!--        background-->
@@ -95,6 +50,7 @@ export default {
         }
       },
       tableSelectData:[],
+      tablecols:[],
       tableData:[],
       currentPage:0,
       total:0,
@@ -164,6 +120,8 @@ export default {
       // })
       this.$emit('onConfirm',this.tableSelectData)
     },
+  },
+  created() {
   }
 }