Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/finance/charge/index.vue

@@ -110,7 +110,7 @@
       <el-table-column type="selection" width="60" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
-      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="220"/>
+      <el-table-column label="货权方" sortable :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="220"/>
       <!--      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">-->
       <!--        <template slot-scope="scope">-->
       <!--          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>-->
@@ -118,8 +118,8 @@
       <!--      </el-table-column>-->
       <!--      <el-table-column label="制单部门" align="center" prop="fId"/>-->
       <!--      <el-table-column label="结算单位" align="center" prop="fCorpid"/>-->
-      <el-table-column label="对账日期" align="center" prop="fAccbilldate" width="120"/>
-      <el-table-column label="提单号" align="center" prop="tMblno" width="216"/>
+      <el-table-column label="对账日期" sortable align="center" prop="fAccbilldate" width="120"/>
+      <el-table-column label="提单号" sortable align="center" prop="tMblno" width="216"/>
       <el-table-column label="应收合计" align="center" prop="fAmtdr" width="120"/>
       <el-table-column label="实收合计" align="center" prop="fAmtcr" width="120"/>
       <el-table-column label="未收金额" align="center" prop="" width="120"/>

src/views/finance/contrast/index.vue

@@ -131,14 +131,14 @@
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
       <el-table-column label="行号" align="center" type="index"/>
       <el-table-column label="系统编号" align="center" prop="fBillno" show-overflow-tooltip width="120"/>
-      <el-table-column label="货权方" align="center" show-overflow-tooltip prop="fCtrlcorpid" width="220"/>
-      <el-table-column label="结算单位" align="center" prop="fCorpidName" show-overflow-tooltip width="220"/>
-      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="120">
+      <el-table-column label="货权方" sortable align="center" show-overflow-tooltip prop="fCtrlcorpid" width="220"/>
+      <el-table-column label="结算单位" sortable align="center" prop="fCorpidName" show-overflow-tooltip width="220"/>
+      <el-table-column label="账单日期" sortable align="center" prop="fAccbilldate" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fAccbilldate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" align="center" prop="tMblno" width="216"/>
+      <el-table-column label="提单号" sortable align="center" prop="tMblno" width="216"/>
       <el-table-column label="金额" align="center" prop="fAmtdr" width="120"/>
       <el-table-column label="对账金额" align="center" prop="fAmtcr" width="120"/>
       <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->

src/views/finance/payment/index.vue

@@ -110,7 +110,7 @@
       <el-table-column type="selection" width="60" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
-      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="220"/>
+      <el-table-column label="货权方" :show-overflow-tooltip="true" sortable align="center" prop="fCtrlcorpid" width="220"/>
       <!--      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">-->
       <!--        <template slot-scope="scope">-->
       <!--          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>-->
@@ -118,8 +118,8 @@
       <!--      </el-table-column>-->
       <!--      <el-table-column label="制单部门" align="center" prop="fId"/>-->
       <!--      <el-table-column label="结算单位" align="center" prop="fCorpid"/>-->
-      <el-table-column label="对账日期" align="center" prop="fAccbilldate" width="120"/>
-      <el-table-column label="提单号" align="center" prop="tMblno" width="216"/>
+      <el-table-column label="对账日期" align="center" sortable prop="fAccbilldate" width="120"/>
+      <el-table-column label="提单号" align="center" sortable prop="tMblno" width="216"/>
       <el-table-column label="应付合计" align="center" prop="fAmtdr" width="120"/>
       <el-table-column label="实付合计" align="center" prop="fAmtcr" width="120"/>
       <el-table-column label="未付金额" align="center" prop="" width="120"/>

src/views/reportManagement/Statistics/index.vue

@@ -134,17 +134,17 @@
     <el-table v-loading="loading" :data="whgenlegList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
-      <el-table-column label="客户" align="center" prop="fName" width="220"/>
-      <el-table-column label="入库日期" align="center" prop="fBsdate" width="120">
+      <el-table-column label="客户" sortable align="center" prop="fName" width="220"/>
+      <el-table-column label="入库日期" sortable align="center" prop="fBsdate" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip width="216"/>
+      <el-table-column label="提单号" sortable align="center" prop="fMblno" show-overflow-tooltip width="216"/>
       <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
       <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
       <el-table-column label="品名" align="center" prop="fGoodsName" width="120"/>
-      <el-table-column label="库区" align="center" prop="fWarehouseLocationids" width="160"/>
+      <el-table-column label="库区" sortable align="center" prop="fWarehouseLocationids" width="160"/>
       <el-table-column label="贸易方式" align="center" prop="fTrademodeid" width="120"/>
 <!--      <el-table-column
         label="贸易方式"

src/views/reportManagement/generalLedgerCr/index.vue

@@ -135,9 +135,9 @@
     <el-table v-loading="loading" :data="payableList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
-      <el-table-column label="货权方" align="center" prop="fName" width="220"/>
-      <el-table-column label="结算单位" align="center" prop="fFeesName" width="220"/>
-      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip width="216"/>
+      <el-table-column label="货权方" sortable align="center" prop="fName" width="220"/>
+      <el-table-column label="结算单位" sortable align="center" prop="fFeesName" width="220"/>
+      <el-table-column label="提单号" sortable align="center" prop="fMblno" show-overflow-tooltip width="216"/>
       <el-table-column label="货物名称" align="center" prop="fProductName" show-overflow-tooltip/>
       <el-table-column label="品牌" align="center" prop="fMarks" />
       <el-table-column label="审核日期" align="center" prop="fReviewDate" width="120">

src/views/reportManagement/generalLedgerDr/index.vue

@@ -134,9 +134,9 @@
     <el-table v-loading="loading" :data="receivableList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
-      <el-table-column label="货权方" align="center" prop="fName" width="220"/>
-      <el-table-column label="结算单位" align="center" prop="fFeesName" width="220" />
-      <el-table-column label="提单号" align="center" prop="fMblno" width="216" show-overflow-tooltip />
+      <el-table-column label="货权方" sortable align="center" prop="fName" width="220"/>
+      <el-table-column label="结算单位" sortable align="center" prop="fFeesName" width="220" />
+      <el-table-column label="提单号" sortable align="center" prop="fMblno" width="216" show-overflow-tooltip />
       <el-table-column label="货物名称" align="center" prop="fProductName" show-overflow-tooltip/>
       <el-table-column label="品牌" align="center" prop="fMarks" width="120"/>
       <el-table-column label="审核日期" align="center" prop="fReviewDate">

src/views/reportManagement/whgenleg/index.vue

@@ -123,22 +123,22 @@
     <el-table v-loading="loading" :data="whgenlegList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" width="120" fixed/>
-      <el-table-column label="客户" align="center" prop="fCorpid" fixed width="220"/>
-      <el-table-column label="入库日期" align="center" prop="fReviewDate" fixed width="120">
+      <el-table-column label="客户" sortable align="center" prop="fCorpid" fixed width="220"/>
+      <el-table-column label="入库日期" sortable align="center" prop="fReviewDate" fixed width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fOriginalbilldate , "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="仓储费计算日期" align="center" prop="fChargedate" fixed width="120">
+      <el-table-column label="仓储费计算日期" sortable align="center" prop="fChargedate" fixed width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fChargedate , "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" align="center" fixed prop="fMblno" show-overflow-tooltip width="216"/>
+      <el-table-column label="提单号" sortable align="center" fixed prop="fMblno" show-overflow-tooltip width="216"/>
       <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
       <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
       <el-table-column label="品名" align="center" prop="fGoodsids" width="120"/>
-      <el-table-column label="仓库" align="center" prop="fWarehouseids" width="120"/>
+      <el-table-column label="仓库" sortable align="center" prop="fWarehouseids" width="120"/>
       <el-table-column
         label="贸易方式"
         align="center"

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -251,12 +251,14 @@
       <el-table-column
         width="220"
         label="货权方"
+        sortable
         align="center"
         prop="fCorpid"
       />
       <el-table-column
         width="220"
         label="转货权方"
+        sortable
         align="center"
         prop="fTocorpid"
       />
@@ -275,6 +277,7 @@
       />
       <el-table-column
         label="货转日期"
+        sortable
         align="center"
         prop="fBsdate"
         width="180"
@@ -289,7 +292,7 @@
         prop="fTrademodeid"
         :formatter="fTrademodeidFormat"
       />
-      <el-table-column label="仓库" align="center" prop="fWarehouseid"/>
+      <el-table-column label="仓库" sortable align="center" prop="fWarehouseid"/>
       <el-table-column label="件数" align="center" prop="fQty"/>
       <el-table-column label="毛重(kg)" align="center" prop="fGrossweight"/>
       <el-table-column label="净重(kg)" align="center" prop="fNetweight"/>

src/views/warehouseBusiness/inStock/index.vue

@@ -277,6 +277,7 @@
         width="100"
         label="入库状态"
         fixed
+        sortable
         align="center"
         prop="fItemsStatus"
       >
@@ -292,16 +293,18 @@
 
         label="货权方"
         fixed
+        sortable
         width="220"
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" fixed width="216" align="center" prop="fMblno" show-overflow-tooltip />
+      <el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip />
       <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="center" prop="fProductName" />
       <el-table-column label="品牌" fixed align="center" prop="fMarks" />
       <el-table-column
         label="入库日期"
         fixed
+        sortable
         align="center"
         prop="fBsdate"
         width="100"
@@ -315,7 +318,7 @@
         prop="fTrademodeid"
         :formatter="fTrademodeidFormat"
       /> -->
-      <el-table-column label="仓库" fixed align="center" prop="fWarehouseid" />
+      <el-table-column label="仓库" fixed sortable align="center" prop="fWarehouseid" />
       <el-table-column label="计划件数" align="center" prop="fPlanqty" />
       <el-table-column label="入库件数" align="center" prop="fQty" />
       <!--      <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->

src/views/warehouseBusiness/outStock/index.vue

@@ -262,6 +262,7 @@
         width="100"
         label="出库状态"
         fixed
+        sortable
         align="center"
         prop="fItemsStatus"
       >
@@ -277,16 +278,18 @@
         width="220"
         label="货权方"
         fixed
+        sortable
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" width="216" align="center" prop="fMblno" fixed show-overflow-tooltip/>
+      <el-table-column label="提单号" sortable width="216" align="center" prop="fMblno" fixed show-overflow-tooltip/>
       <el-table-column label="品名" :show-overflow-tooltip="true" fixed align="ceter" prop="fProductName" />
       <el-table-column label="品牌" align="center" fixed prop="fMarks" />
       <el-table-column
         label="出库日期"
         align="center"
         fixed
+        sortable
         prop="createTime"
         style="width: 60%"
         width="100"
@@ -295,7 +298,7 @@
         <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
       </template>
       </el-table-column>
-      <el-table-column label="仓库" fixed align="center" prop="fWarehouseid" />
+      <el-table-column label="仓库" sortable fixed align="center" prop="fWarehouseid" />
       <el-table-column label="计划件数" align="center" prop="fPlanqty" />
       <el-table-column label="出库件数" align="center" prop="fQty" />
       <el-table-column label="出库毛重(kg)" align="center" prop="fGrossweight" width="100"/>

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -262,6 +262,7 @@
       <el-table-column
         width="100"
         fixed
+        sortable
         label="调拨状态"
         align="center"
         prop="fItemsStatus"
@@ -278,24 +279,26 @@
         width="220"
         label="货权方"
         fixed
+        sortable
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" fixed width="216" align="center" prop="fMblno" show-overflow-tooltip/>
+      <el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip/>
       <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="ceter" prop="fProductName" />
       <el-table-column label="品牌" fixed align="center" prop="fMarks" />
       <el-table-column
         label="调拨日期"
         align="center"
         fixed
+        sortable
         prop="createTime"
         width="100"
         ><template slot-scope="scope">
           <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调入仓库" fixed align="center" prop="fWarehouseid" />
-      <el-table-column label="调出仓库" fixed align="center" prop="fInwarehouseid" />
+      <el-table-column label="调入仓库" sortable fixed align="center" prop="fWarehouseid" width="100"/>
+      <el-table-column label="调出仓库" sortable fixed align="center" prop="fInwarehouseid" width="100"/>
       <el-table-column label="计划调拨件数" align="center" prop="fPlanqty" width="100"/>
       <el-table-column label="调拨件数" align="center" prop="fQty" />
       <el-table-column label="调拨毛重(kg)" align="center" prop="fGrossweight" width="100"/>