Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -20,7 +20,11 @@
       </el-table-column> -->
       <el-table-column
         prop="rowno"
-        label="行号">
+        label="发货单行号">
+      </el-table-column>
+      <el-table-column
+        prop="orderRowno"
+        label="订单行号">
       </el-table-column>
       <el-table-column
         prop="itemno"

src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -98,7 +98,7 @@ export default {
         },
         {
           label:'开票金额',
-          value:this.mainData.suminvoiceamount
+          value:this.tool.formatAmount(this.mainData.suminvoiceamount,2)
         },
         {
           label:'开票方式',
@@ -128,7 +128,7 @@ export default {
         },
         {
           label:'发票限额',
-          value:this.mainData.quota
+          value:this.tool.formatAmount(this.mainData.quota,2)
         },
 
 

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/canUseInvioceItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status !== '新建'" size="small" type="primary" @click="onShow">添加开票明细行</el-button>
+    <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status =! '提交' && status != '新建'" size="small" type="primary" @click="onShow">添加开票明细行</el-button>
     <el-dialog title="选择开票明细行" :visible.sync="dialogTableVisible" append-to-body>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTable.vue

@@ -61,8 +61,8 @@
             <upload class="inline-16" :folderid="folderid" :bindData="{ownertable: 'sa_invoicebill', ownerid: scope.row.sa_invoicebillid,usetype: 'default'}" @onSuccess="listData" btntype="icon"></upload>
             <a class="table_row_link inline-16" v-if="scope.row.attinfos.length > 0" :href="scope.row.attinfos[scope.row.attinfos.length - 1].url">下载发票</a>
           </div>
-          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" @click="editRow(scope.row)" type="text" size="mini" :disabled="data.status !== '新建'">编 辑</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" @click="deleteRow(scope.row)" type="text" size="mini" :disabled="data.status !== '新建'">删 除</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" @click="editRow(scope.row)" type="text" size="mini" :disabled="data.status !== '新建' && data.status !== '提交'">编 辑</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" @click="deleteRow(scope.row)" type="text" size="mini" :disabled="data.status !== '新建' && data.status !== '提交'">删 除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -46,7 +46,7 @@
       <el-table-column label="操作" width="90" fixed="right">
         <template slot-scope="scope">
           <editmx class="inline-16" :status="status" :sa_invoicebillid="param.content.sa_invoicebillid" :data="scope.row" @onSuccess="onSuccess"></editmx>
-          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status !== '新建'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status !== '新建' && status !== '提交'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-button-group v-if="tool.checkAuth($route.name,'editBlueInvioce')" style="margin-bottom:10px">
-      <el-button size="small" type="primary" :disabled="data.status !== '新建'" @click="addInvoiceapp">一键添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="data.status !== '新建'" @click="addInvoiceapp2">添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 || data.status !== '审核' || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 || data.status !== '审核' || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  data.status !== '审核'" @click="blueInvioceToRed">红冲勾选行</el-button>
+      <el-button size="small" type="primary" :disabled="data.status !== '提交' && data.status !== '审核'" @click="addInvoiceapp">一键添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="data.status !== '提交' && data.status != '审核'" @click="addInvoiceapp2">添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status !== '提交' && data.status != '审核') || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status !== '提交' && data.status != '审核') || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  (data.status !== '提交' && data.status != '审核')" @click="blueInvioceToRed">红冲勾选行</el-button>
     </el-button-group>
     <invoiceTable :data="data" ref="invoiceTable" @activeRow="activeRow" @selection="selection"></invoiceTable>
     <invoiceTablemx :status="data.status" ref="invoiceTablemx" @onSuccess="mxOnSuccess"></invoiceTablemx>

src/HDrpManagement/invoiceapp/index.vue

@@ -17,7 +17,7 @@
       <template #custom>
         <div class="mt-10">
           <label class="search__label">状态:</label>
-          <el-select class="inline-16" v-model="status" size="small" placeholder="请选择状态" @change="selectChange" clearable>
+          <el-select class="inline-16" v-model="q_status" size="small" placeholder="请选择状态" @change="selectChange" clearable>
             <el-option label="新建" value="新建"></el-option>
             <el-option label="提交" value="提交"></el-option>
             <el-option label="审核" value="审核"></el-option>
@@ -48,6 +48,10 @@
         <div v-else-if="scope.data.column.columnname == 'byhand'">
           <span>{{scope.data.column.data.byhand == 1?'手工':'线上'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'suminvoiceamount'">
+          <span>{{this.tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
+        </div>
+        
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>
@@ -71,7 +75,7 @@ export default {
   data () {
     return {
       options:[],
-      status:'',
+      q_status:'',
       dateSelect:[]
     }
   },
@@ -89,7 +93,7 @@ export default {
         this.$refs.basicLayout.param.content.where.begindate = ''
         this.$refs.basicLayout.param.content.where.enddate = ''
       }
-      this.$refs['basicLayout'].param.content.where.status = this.status
+      this.$refs['basicLayout'].param.content.where.status = this.q_status
       this.$refs['basicLayout'].param.content.pageNumber = 1
       this.$refs['basicLayout'].listData()
     }

src/HDrpManagement/logistics/modules/add.vue

@@ -15,7 +15,7 @@
           <enterprise :qiyi="true" ref="ent" @rowClick="entRowClick"></enterprise>
         </el-form-item>
         <el-form-item label="物流公司">
-          <logisticcom ref="logis" @logisticRowClick="logisticRowClick"></logisticcom>
+          <logisticcom ref="logis" :ID="true" @logisticRowClick="logisticRowClick"></logisticcom>
         </el-form-item>
         <el-form-item label="物流单号">
           <el-input v-model="form.billno" placeholder="物流单号"></el-input>

src/HDrpManagement/logistics/modules/edit.vue

@@ -16,7 +16,7 @@ ed<template>
         </el-form-item>
         <el-form-item label="物流公司">
           <!-- <el-input v-model="form.logic" placeholder="物流公司"></el-input> -->
-          <logisticcom ref="logis" @logisticRowClick="logisticRowClick"></logisticcom>
+          <logisticcom :ID="true" ref="logis" @logisticRowClick="logisticRowClick"></logisticcom>
         </el-form-item>
         <el-form-item label="物流单号">
           <el-input v-model="form.logisticno" placeholder="物流单号"></el-input>

src/HDrpManagement/orderManage/details/tabs/defaultInfo.vue

@@ -20,6 +20,13 @@
       <el-descriptions-item label="联系人">{{ mainData.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
       <el-descriptions-item label="联系电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
       <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province?mainData.contacts.province:''}${mainData.contacts.city?mainData.contacts.city:''}${mainData.contacts.county?mainData.contacts.county:''}${mainData.contacts.address?mainData.contacts.address:''}`:'--'}}</el-descriptions-item>
+      <el-descriptions-item label="创建人">{{ mainData.createby?mainData.createby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="创建时间">{{ mainData.createdate?mainData.createdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="提交人">{{ mainData.submitby?mainData.submitby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="提交时间">{{ mainData.submitdate?mainData.submitdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="审核人">{{ mainData.checkby?mainData.checkby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="审核时间">{{ mainData.checkdate?mainData.checkdate:"--" }}</el-descriptions-item>
+
     </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -47,7 +47,8 @@
           label="数量"
           width="180">
           <template slot-scope="scope">
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
             <span v-else>{{scope.row.qty}}</span>
           </template>
         </el-table-column>
@@ -168,7 +169,7 @@
           label="折后价格"
           width="100">
           <template slot-scope="scope">
-            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model.number="scope.row.price" @input="onInput(scope.row,scope.$index)" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
+            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model="scope.row.price"  placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
             <p v-else>¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
           </template>
         </el-table-column>
@@ -262,7 +263,7 @@ export default {
         "content": {
           "sa_orderid": 0, //订单ID
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 9999,
           "where": {
             "condition": ""
           }

src/HDrpManagement/serveBill/components/add.vue

@@ -178,7 +178,11 @@ export default {
       agentParam: {
         "id":20221216145803,
         "content": {
-
+          "pageNumber":1,
+          "pageSize":20,
+          "where": {
+            condition:''
+          }
         }
       }
     }

src/HDrpManagement/serveBill/components/edit.vue

@@ -125,7 +125,7 @@
 </template>
 
 <script>
-import selectAgent from '@/template/selectAgent/index'
+import selectAgent from './selectAgent'
 import selectOrder from './selectOrder'
 import { log } from '@antv/g2plot/lib/utils'
 

src/HDrpManagement/serveBill/components/selectAgent.vue

@@ -0,0 +1,112 @@
+<template>
+  <div> 
+    <el-dialog :visible.sync="visible" append-to-body width="50%">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input 
+          style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      </div>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+          style="width: 100%"
+          size="mini"
+          height="50vh"
+          border>
+          <el-table-column
+            prop="enterprisename"
+            :label="qiyi ? '企业名称' : '经销商名称'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="agentnum"
+            :label="qiyi ? '编号' : '经销商编号'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="contact"
+            label="联系人">
+          </el-table-column>
+          <el-table-column
+            label="地址">
+            <template slot-scope="scope">
+              {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="selectRow(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="param.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['customParam','qiyi'],
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id":20221216145803,
+        "content": {
+          "pageNumber":1,
+          "pageSize":20,
+          where: {
+            condition:''
+          }
+        }
+      },
+      tableData: [],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.customParam ? this.customParam : this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    selectRow (row) {
+      this.$emit('selectRow',row)
+    }
+  },
+  created () {
+    this.listData()
+  },
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/writeoffbill/index.vue

@@ -50,6 +50,12 @@
           <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'writeoffamount'">
+          <span>{{ tool.formatAmount(scope.data.column.data.writeoffamount,2) }}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'unwriteoffamount'">
+          <span>{{ tool.formatAmount(scope.data.column.data.unwriteoffamount,2) }}</span>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/HManagement/siteManage/securityConfig/modules/productImage.vue

@@ -4,8 +4,8 @@
     <el-dialog title="设置"  append-to-body :visible.sync="dialogEditVisible">
       <el-row :gutter="16">
         <el-col :span="12">
-          <p>企业水印图片：</p>
-          <uploadFile v-if="!image.url" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG" btntype="image" :bindData="{ownertable:'system',ownerid:0,usetype:'defaultImage'}" @onSuccess="queryFileLink"></uploadFile>
+          <p> 默认图片：</p>
+          <uploadFile v-if="!image.url" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG" btntype="image" :bindData="{ownertable:'system',ownerid:1,usetype:'defaultImage'}" @onSuccess="queryFileLink"></uploadFile>
           <div v-else>
             <!-- <img  style="width:100%" :src="image.url" alt=""> -->
             <viewImage :image="image" :deletebtn="true" @onSuccess="queryFileLink"></viewImage>
@@ -54,7 +54,7 @@ export default {
         "method": "queryFileLink",
         "content": {
           "ownertable": 'system',
-          "ownerid": 0,
+          "ownerid": 1,
           "usetype":'defaultImage'//传空返回有所
         }
       })

src/SDrpManagement/ProductGroup/index.vue

@@ -18,7 +18,7 @@
       <div class="group-list content">
         <div class="group-item" v-for="item in productGroup" :key="item.sa_itemgroupid" @click="itemClick(item)">
           <div class="top">
-            <el-image style="width:100%" :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="cover" />
+            <el-image style="width:100%" :src="item.attinfos[0].url" fit="cover" />
           </div>
           <div class="bottom">
             <p class="title">{{item.groupname}}</p>
@@ -106,9 +106,18 @@ export default {
     async getProductGroup() {
       this.params.content.brandids = this.brandId
       let res = await this.$api.requested(this.params)
+      res.data = res.data.map(e=>{
+        if (e.attinfos.length > 0) {
+          return e
+        } else {
+          e.attinfos.push({
+            url:e.cover
+          })
+          return e
+        }
+      })
+      console.log(res.data,'--')
       this.productGroup = res.data
-      console.log(this.productGroup);
-      
       this.total = res.total
       this.currentPage = res.pageNumber
     },

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -3,7 +3,7 @@
   <el-tag style="margin-left: 15px" size="small" >{{selectProduct.brandname}}</el-tag>
   <div class="product-detail container flex-align-stretch" style="width: 100%">
     <div>
-      <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage.url" fit="cover" />
+      <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="cover" />
       <div class="flex-align-stretch column">
         <el-image class="thumImage mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="cover" />
       </div>
@@ -108,11 +108,8 @@ export default {
       this.detail = res.data
       this.selectProduct = this.detail ? this.detail[0] : ''
       this.actImage = this.detail ? this.detail[0].attinfos[0] : {}
-      console.log(this.actImage)
       this.tradefield  = this.detail ? this.detail[0].tradefield : []
       this.actTradefield = this.detail[0].tradefield[0].tradefield
-      console.log(this.actTradefield)
-      console.log(this.actImage)
     },
     countChange (num) {
       this.count = num

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -33,6 +33,11 @@ export default {
       class_act:''
     }
   },
+  provide () {
+    return {
+      selectThis:() => this
+    }
+  },
   props: {
     default: {
       type: Boolean,
@@ -90,20 +95,18 @@ export default {
     clickClass (item) {
       if (item) {
         this.activeClass = item
-        console.log(item);
-        
         this.class_act = item.itemclassnum
-        this.change(item)
+        this.$emit('onClassChange',item)
       } else {
         this.class_act = ''
         this.$emit('onClassChange',item)
       }
-      console.log(this.class_act);
+      console.log('分类单机出发');
       
       
     },
     change(n) {
-      console.log(n)
+      console.log('分类单机出发2');
       this.$emit('onClassChange',n)
     },
     clearSearch() {

src/SDrpManagement/ProductGroup/modules/classTree.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <div class="flex-start">
-      <div v-for="item in data" :key="item.index" @click="classClick(item)">
+      <div v-for="item in data" :key="item.index" @click.stop="classClick(item)">
         <p class="classItem" v-if="item.index === 1"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
         <p class="classItem"  v-else   :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
-        <Tree v-if="item.subdep && class_act === item.itemclassnum" :data="item.subdep" @onClassChange="change"></Tree>
+        <Tree v-if="item.subdep && class_act === item.itemclassnum" :data="item.subdep"></Tree>
       </div>
     </div>
   </div>
@@ -14,6 +14,7 @@
 export default {
   name: "Tree",
   props:['data'],
+  inject:['selectThis'],
   data () {
     return {
       activeClass:{},
@@ -25,11 +26,8 @@ export default {
       console.log(item)
       this.activeClass = item
       this.class_act = item.itemclassnum
-      this.change(item)
+      this.selectThis().change(item)
     },
-    change(item) {
-      this.$emit('onClassChange',item)
-    }
   }
 }
 </script>

src/SDrpManagement/Products/modules/ProductDetails.vue

@@ -4,7 +4,7 @@
     <div class="flex-align-stretch column">
       <el-image class="thumImage mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="cover" />
     </div>
-    <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage.url" fit="cover" />
+    <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="cover" />
     <div style="flex:1">
       <p class="productName normal-margin">{{selectProduct.itemname}}</p>
       <p class="normal-margin" style="color:#888;">编码:&emsp;{{selectProduct.itemno}}</p>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -210,7 +210,7 @@ export default {
         "content": {
           "sa_orderid": 0, //订单ID
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 9999,
           "where": {
             "condition": ""
           }

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -218,7 +218,7 @@ export default {
         "content": {
           "sa_orderid": 0, //订单ID
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 9999,
           "where": {
             "condition": ""
           }

src/components/dynamic-table/index.vue

@@ -4,12 +4,14 @@
     <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini" :height="height" @row-click="rowClick" style="width:100%;min-height:300px"  border>
       <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : false">
         <template slot-scope="scope">
-          <!-- 自定义表格显示内容 -->
-          <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
-          <!-- 否则就是默认 -->
-          <span v-else>{{scope.row[col.columnname]}}</span>
-          <!-- 操作结构内容 -->
-          <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+          <div class="table-panel">
+            <!-- 自定义表格显示内容 -->
+            <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+            <!-- 否则就是默认 -->
+            <span v-else>{{scope.row[col.columnname]}}</span>
+            <!-- 操作结构内容 -->
+            <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+          </div>
         </template>
       </el-table-column>
     </el-table>

src/style/style.css

@@ -232,3 +232,8 @@ ul{
   text-decoration: underline;
   cursor: pointer;
 }
+.el-tooltip span,.el-tooltip p{
+  overflow: hidden;
+  white-space: nowrap !important;
+  text-overflow: ellipsis !important;
+}

src/template/orderCanUseContract/index.vue

@@ -11,8 +11,9 @@
       </div>
       <el-table
       :data="tableData"
-      style="width: 100%"
+      style="width: 100%;"
       size="mini"
+      height="500px"
       border>
       <el-table-column
         prop="billno"

src/template/selectAgent/index.vue

@@ -2,7 +2,15 @@
   <div> 
     <el-dialog :visible.sync="visible" append-to-body width="50%">
       <div class="flex-align-center flex-between mt-10">
-        <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+        <el-input 
+          style="width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          placeholder="搜索" 
+          @input="valueChange"
+          v-model="condition"
+          @keyup.enter.native="listData(customParam ? customParam.content.pageNumber = 1 : param.content.pageNumber = 1)" 
+          @clear="listData(customParam ? customParam.content.pageNumber = 1 : param.content.pageNumber = 1)" clearable></el-input>
       </div>
       <div>
         <el-table
@@ -58,6 +66,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   props:['customParam','qiyi'],
   data () {
@@ -76,6 +85,7 @@ export default {
       },
       tableData: [],
       total:0,
+      condition:'',
       currentPage:0
     }
   },
@@ -88,6 +98,14 @@ export default {
       console.log(this.tableData);
       
     },
+    valueChange (data) {
+      console.log(data);
+      if (this.customParam) {
+        this.customParam.content.where.condition = data
+      } else {
+        this.param.content.where.condition = data
+      }
+    },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val

src/template/selectLogisticcom/index.vue

@@ -50,8 +50,10 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 // import addTemp from '@/Form/EnterpriseArchives/add.vue'
 export default {
+  props:['ID'],
   components:{
   },
   data () {
@@ -92,7 +94,7 @@ export default {
     },
     rowClick (row) {
       this.visible = false
-      this.form.abbreviation = row.abbreviation
+      this.form.abbreviation = this.ID ? row.kd100id : this.abbreviation
       this.$emit('logisticRowClick',row)
     }
   },

vue.config.js

@@ -20,9 +20,8 @@ module.exports = {
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites
           pathRewrite: {
-              '^/apis': ''  // rewrite path
+            '^/apis': ''  // rewrite path
           },
-
         },
       }
     }