Merge pull request 'master-客户管理' (#47) from master-客户管理 into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/47

src/api/emis/emisBatchGroupLog.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+// 查询批次操作日志列表
+export function listEmisBatchOperLog(batchNo) {
+  return request({
+    url: '/emis/emisTmsSiteBatchLog/getTmsSiteBatchLogList',
+    method: 'get',
+    params: {
+      batchNo: batchNo
+    }
+  })
+}

src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue

@@ -12,7 +12,9 @@
           <el-tab-pane label="批次查看"  name="batchView" v-if="openViewForm" closable >
             <BigBatchEditForm :key="'batchView_'+batchId"  :batchId="batchId" disabled  ></BigBatchEditForm>
           </el-tab-pane>
-
+          <el-tab-pane label="日志记录"  name="batchLog" v-if="openViewForm">
+            <BatchLogList :key="'batchLog_'+batchId"  :batchNo="batchNo" disabled  ></BatchLogList>
+          </el-tab-pane>
         </el-tabs>
     </div>
   </div>
@@ -22,13 +24,14 @@
 import BigBatchListPanel from '@/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue';
 import BigBatchEditForm from '@/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue';
 import BigBatchViewOnly from '@/views/emis/emisTmsSiteBatch/panel/BigBatchViewOnly.vue';
-
+import BatchLogList from '@/views/emis/emisTmsSiteBatch/panel/BatchLogList.vue';
 export default {
   name: "BigBatchGroupMgnt",
   components: {
     BigBatchListPanel,
     BigBatchEditForm,
-    BigBatchViewOnly
+    BigBatchViewOnly,
+    BatchLogList,
  },
   dicts: [
   ],
@@ -39,6 +42,7 @@ export default {
       openEditForm:false,
       openViewForm:false,
       batchId:null,
+      batchNo:null,
       isCopy:false,
       editTabTitle:'批次编辑',
     };
@@ -71,8 +75,9 @@ export default {
       this.editTabTitle='批次复制';
       this.activeTab='batchEdit';
     },
-    onViewBatch(batchId){
+    onViewBatch(val){
-      this.batchId=batchId;
+      this.batchId=val.id;
+      this.batchNo =val.batchNo;
       this.isCopy = false;
       this.openViewForm=true;
       this.activeTab='batchView';

src/views/emis/emisTmsSiteBatch/panel/BatchLogList.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="">
+    <XdTable v-loading="loading"
+           border
+           size="mini"
+           :data="operLogDataList"
+           :total="total"
+           :showRightButton="false"
+           :showPagination="false"
+           :showOperateButton="false"
+           :showCustomizeTpl="false"
+           :default-sort="{prop: 'opDate', order: 'ascending'}"
+           >
+      <el-table-column label="序号" align="center" width="60">
+        <template slot-scope="scope">
+          <span v-text="getIndex(scope.$index)"> </span>
+        </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('操作时间')" align="center" prop="opDate"  :sortable="true" :sort-method="sortByOpDate" width="170" >
+        <template slot-scope="scope">
+          <span>{{ (scope.row.opDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('操作描述')" align="left" prop="opDesc" min-width="320" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span >{{scope.row.opDesc}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('操作网点')" align="center" prop="opSiteName" min-width="120" />
+      <el-table-column :label="$t('操作人')" align="center" prop="opMan" min-width="80" />
+
+    </XdTable>
+  </div>
+</template>
+
+<script>
+import { listEmisBatchOperLog } from "@/api/emis/emisBatchGroupLog";
+
+export default {
+  name: "OperLogList",
+   props:{
+    batchNo:{
+      type: String,
+    }
+  },
+  dicts: [],
+  data() {
+    return {
+      reverse: false,
+      loading: true,
+      operLogDataList: [],
+      total:0,
+      queryParams:{
+            pageNum:1,
+            pageSize:1000,
+            batchNo:this.batchNo
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+      "batchNo": {
+      handler (newValue, oldValue) {
+        this.getList();
+      },
+      deep: true
+    }
+  },
+  methods: {
+    sortByOpDate(obj1, obj2) {
+      let val1 = new Date(obj1.opDate)
+      let val2 = new Date(obj2.opDate)
+      return val1.getTime() - val2.getTime()
+    },
+    getList() {
+         this.loading = true;
+         listEmisBatchOperLog(this.batchNo).then(response => {
+          this.operLogDataList = response.rows;
+          this.total=response.total;
+          this.loading = false;
+        });
+
+    },
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+
+  }
+};
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss">
+
+.margin-top{
+  margin-top: 20px;
+}
+
+.el-descriptions-item__label.is-bordered-label {
+    min-width: 80px;
+}
+
+.printMeClass {
+  font-family: SimHei;
+  label {
+    font-weight: normal;
+  }
+}
+
+.siteOrManHighlight {
+  color: #00BFFF;
+  font-weight: bold;
+}
+
+.transferGray{
+  color: gray;
+}
+</style>

src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue

@@ -574,7 +574,7 @@ export default {
       this.$emit("onCopy",this.ids);
     },
     handleShowBatchInfo(row){
-      this.$emit("onView",row.id);
+      this.$emit("onView",row);
     },
     handleFormChanged(){
         this.openForm = false;

src/views/emis/salesMonthlyReview/draftSubmitReview.vue

@@ -92,7 +92,7 @@ import { timeDiffTime, excelDateToJSDate } from '@/utils/dateUtils'
 import XLSX from 'xlsx'
 
 export default {
-    name: "BatchWaybillRecord",
+    name: "DraftSubmitReview",
     data() {
         return {
             resetRefreshId: null,