更新文件

src/components/edittablehead/index.vue

@@ -9,6 +9,7 @@
         :prop="column.prop"
         :label="column.label"
         :width="column.width"
+        flexible
       >
         <template #header>
           <el-text class="mx-1">{{ column.label }}</el-text>
@@ -244,7 +245,7 @@ let headtop = ref<headtoptype[]>([
   {
     prop: 'label',
     label: '列名',
-    width: '280',
+    width: '',
   },
   {
     prop: '',

src/components/tablecmt/tablecmt.vue

@@ -84,10 +84,8 @@
 
         <template #default="scope">
           <el-text class="mx-2 tabculconte" v-if="(Number(column.type)<6&&Number(column.type)>0)">{{ scope.row[column.prop] }}</el-text>
-          <el-tooltip placement="top" v-if="column.type == 9">
+          <el-text style="" class="mx-2 tabculconte colors" v-if="column.type == 9"  @click="godowns(scope.row[column.downprop])">{{ scope.row[column.prop] }}</el-text>
-            <template #content>{{ scope.row[column.prop] }}</template>
+
-            <div style="color: #409EFF;cursor: pointer;" @click="godowns(scope.row[column.downprop])" class="on">{{ scope.row[column.prop] }}</div>
-          </el-tooltip>
           <div class="slotbuts" v-if="column.type == 6">
             <slot v-if="column.type == 6" :scope="scope">
             </slot>
@@ -220,10 +218,15 @@ const tableRowClassName = ({
   row: TableDataType
   rowIndex: number
 })  => {
-  if (rowIndex === 1) {
+  console.log(row)
-    return 'warning-row'
+  let sfcheck=false
-  } else if (rowIndex === 3) {
+  selectarr.value.map(item=>{
-    return 'success-row'
+    if(item.id==row.id){
+      sfcheck=true
+    }
+  })
+  if(sfcheck){
+    return 'table-SelectedRow-bgcolor'
   }
   return ''
 }
@@ -328,9 +331,7 @@ watchEffect(()=>{
 
 .el-table {
   //悬停
-  --el-table-row-hover-background-color: #f0f9eb !important;
+  --el-table-row-hover-bg-color: #D3832A;
-  //选中
-  --el-table-current-row-background-color: #f0f9eb !important;
 }
 
 // .el-table .warning-row {
@@ -428,4 +429,19 @@ watchEffect(()=>{
   border-color: #D3832A!important;
   font-size: 12px !important;
 }
+.table-SelectedRow-bgcolor {
+      td{
+        background-color:#f7e8d7 !important;
+      }
+    }
+.colors{
+  color: #409EFF !important;
+  cursor: pointer !important;
+}
+.el-table .el-input__inner{
+  font-size: 12px !important;
+}
+.el-table__body tr.hover-row.current-row>td,.el-table__body tr.hover-row.el-table__row--striped.current-row>td,.el-table__body tr.hover-row.el-table__row--striped>td,.el-table__body tr.hover-row>td{
+    background-color:#d3d8e1 !important;
+}
 </style>

src/utils/functions.js

@@ -1,14 +1,14 @@
 const utils={
     getStorage:(key)=>{
         let tenant_id=JSON.parse(localStorage.getItem('TWMS-userInfo')).content.tenant_id
-        let data=localStorage.getItem(tenant_id+''+key)
+        let data=sessionStorage.getItem(tenant_id+''+key)
         return JSON.parse(data)
     },
     setStorage:(key,data)=>{
         let tenant_id=JSON.parse(localStorage.getItem('TWMS-userInfo')).content.tenant_id
         let newdata=JSON.stringify(data)
         console.log(tenant_id+''+key,newdata)
-        localStorage.setItem(tenant_id+''+key,newdata)
+        sessionStorage.setItem(tenant_id+''+key,newdata)
         return true
     }
 }

src/utils/store.js

@@ -18,7 +18,8 @@ export const setStore = (params = {}) => {
     if (type) window.sessionStorage.setItem(name, JSON.stringify(obj));
     else window.localStorage.setItem(name, JSON.stringify(obj));
   } catch (error) {
-    console.log(error,'error')
+    console.log(error,'error',params,'params')
+    window.localStorage.key()
   }
 };
 /**

src/utils/watermark.js

@@ -16,7 +16,7 @@ let setWatermark = (str) => {
 
     let cans = can.getContext('2d')
     cans.rotate(-15 * Math.PI / 150)
-    cans.font = '70px Vedana'
+    cans.font = '50px Vedana'
     cans.fillStyle = 'rgba(17, 17, 17, 0.10)'
     cans.textAlign = 'left'
     cans.textBaseline = 'Middle'
@@ -26,7 +26,7 @@ let setWatermark = (str) => {
     div.id = id
     div.style.pointerEvents = 'none'
     div.style.top = '50px'
-    div.style.left = '100px'
+    div.style.left = '500px'
     div.style.position = 'fixed'
     div.style.zIndex = '1000000'
     div.style.width = document.documentElement.clientWidth + 'px'

src/views/basicdata/brand/basicBrand.vue

@@ -60,61 +60,11 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
+            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text>
+              <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text>
+              <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
           </template>
         </tablecmt>
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
-          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-          <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
-          </el-table-column>
-          <template v-for="(item,index) in option.column">
-
-            <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true "
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index" align="center">
-              <template #default="{row,$index}" v-if="item.hide!==true && item.prop =='brandIcon'">
-<!--                    {{$index}}-->
-                <div class="demo-image__preview">
-                  <el-image v-if="row.brandIcon !== undefined"
-                            lazy
-                            style="width: 140px; height: 45px;"
-                            :src="row.brandIcon"
-                            :preview-src-list="srcList"
-                            :initial-index="$index"
-                            fit="cover"
-                  />
-                </div>
-
-              </template>
-            </el-table-column>
-<!--            <el-table-column v-if="item.hide!==true && item.prop =='brandIcon'"-->
-<!--                             :prop="item.prop"-->
-<!--                             :label="item.label"-->
-<!--                             :width="item.width"-->
-<!--                             :key="index" align="center">-->
-<!--            -->
-<!--              -->
-<!--            </el-table-column>-->
-          </template>
-          <!-- 操作栏模块 -->
-          <el-table-column prop="menu" label="操作" :width="300" align="center">
-            <template #="{row}">
-              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
-<!--              <el-button type="primary" text icon="el-icon-setting" @click="handleDrawer(row)">子表配置</el-button>-->
-            </template>
-          </el-table-column>
-        </el-table>
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -215,74 +165,44 @@ export default {
           fixed: true,
         },
         {
-          prop: 'stockArticleId',
+          prop: 'brandName',
-          label: '订单自编号',
+          label: '品牌名称',
           type: 2,
           values: '',
-          width: '150',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
           head: false,
         },
         {
-          prop: 'warehouseName',
+          prop: 'brandCode',
-          label: '配送仓库',
+          label: '品牌编号',
           type: 2,
           values: '',
-          width: '150',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
           head: false,
         },
         {
-          prop: 'consignee',
+          prop: 'brandIcon',
-          label: '客户名称',
+          label: '品牌图标',
-          type: 2,
+          type: 7,
           values: '',
-          width: '150',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
           head: false,
         },
         {
-          prop: 'deliveryPhone',
+          prop: 'acceptanceTime',
-          label: '客户电话',
+          label: '承接时间',
           type: 2,
           values: '',
-          width: '180',
+          width: '',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'deliveryAddress',
-          label: '客户地址',
-          type: 2,
-          values: '',
-          width: '300',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'deliveryType',
-          label: '业务类型',
-          type: 3,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'signingTime',
-          label: '文员签收时间',
-          type: 4,
-          values: '',
-          width: '180',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -292,7 +212,7 @@ export default {
           label: '操作',
           type: 6,
           values: '',
-          width: '150',
+          width: '300',
           checkarr: [],
           fixed: 'right',
           hide: true,

src/views/basicdata/brand/basicZonePrice.vue

@@ -71,35 +71,25 @@
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
+        <tablecmt
-                  @selection-change="selectionChange"
+          :columnList="columnList"
-                  :data="data"
+          :tableData="data"
-                  :height="height"
+          :loading="loading"
-                  style="width: 100%"
+          @inputTxt="inputsc"
-                  :border="option.border">
+          @timeCheck="timesc"
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          @btnCheck="btnsc"
-          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          @selectCheck="selectsc"
-          <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
+          @selection="selectionChange"
-          </el-table-column>
+        >
-          <template v-for="(item,index) in option.column">
+          <template #default="slotProps">
-            <!-- table字段 -->
+            
-            <el-table-column v-if="item.hide!==true"
+            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text>
-                             :prop="item.prop"
+              <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text>
-                             :label="item.label"
+              <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
-
+              <el-text type="primary" text icon="el-icon-setting" @click="handleDrawer(slotProps.scope.row)">费用明细</el-text>
-                             :key="index" align="center">
-            </el-table-column>
           </template>
-          <!-- 操作栏模块 -->
+        </tablecmt>
-          <el-table-column prop="menu" label="操作" :width="300" align="center">
+        
-            <template #="{row}">
-              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
-<!--              <el-button type="primary" text icon="el-icon-setting" @click="handleDrawer(row)">费用明细</el-button>-->
-            </template>
-          </el-table-column>
-        </el-table>
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -308,6 +298,90 @@ export default {
   },
   data () {
     return {
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'brandName',
+          label: '品类',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'beginName',
+          label: '始发仓',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'province',
+          label: '始发仓地址',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'endName',
+          label: '末端仓',
+          type: 2,
+          values: '',
+          width: '',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'provinceEnd',
+          label: '末端仓地址',
+          type: 2,
+          values: '',
+          width: '',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          type: 2,
+          values: '',
+          width: '',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '300',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ],
       optionProps:{
         value: 'id',
         label: 'cName',

src/views/warehouse/warehouseWaybill.vue

@@ -327,7 +327,7 @@
             <div>
               {{ itemlimit.productName }}
             </div>
-            <div>
+            <div class="numbinput">
               <el-input v-model="itemlimit.splitNum" type='number' placeholder="请输入数量" />
             </div>
           </div>
@@ -1183,6 +1183,16 @@ export default {
 </script>
 
 <style lang="scss">
+.numbinput{
+  margin: auto;
+  width: 80% !important;
+  .el-input{
+    width: 80% !important;
+    input{
+      height: 28px !important;
+    }
+  }
+}
 .btsbx {
   display: flex;
   align-items: center;
@@ -1199,6 +1209,7 @@ export default {
   // padding: 10px;
   box-sizing: border-box;
   margin-top: 20px;
+  font-size: 12px;
   > .items {
     display: flex;
     flex-direction: column;
@@ -1208,6 +1219,7 @@ export default {
     box-sizing: border-box;
     border: 1px solid #e2e0e0;
     border-radius: 2px;
+    font-size: 12px;
     margin-bottom: 20px;
     &:nth-last-child(1) {
       margin-bottom: 0;
@@ -1245,6 +1257,12 @@ export default {
           border: 1px solid #e2e0e0;
           margin-bottom: -2px;
           margin-right: -2px;
+          input{
+            font-size: 12px !important;
+          }
+          textarea{
+            font-size: 12px !important;
+          }
         }
       }
     }
@@ -1278,6 +1296,12 @@ export default {
 
           flex: 1;
           padding-right: 10px;
+          input{
+            font-size: 12px !important;
+          }
+          textarea{
+            font-size: 12px !important;
+          }
           > span {
             width: 90px;
           }
@@ -1293,13 +1317,14 @@ export default {
   display: flex;
   flex-direction: column;
   > .titlxbx {
-    font-size: 16px;
+    font-size: 12px;
     display: flex;
     align-items: center;
     > div {
       flex: 1;
       display: flex;
       align-items: center;
+      font-size: 12px;
       > div {
         flex: 1;
         height: 40px;
@@ -1310,6 +1335,7 @@ export default {
         margin-bottom: -1px;
         margin-right: -1px;
         word-break: break-all;
+        font-size: 12px;
         &:nth-of-type(1) {
           background-color: #f3f3f3;
         }