From c1f8cf3bad440828a0c1bcad7a2b0d9deb70a9ae Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 19 四月 2023 10:09:49 +0800
Subject: [PATCH] 1.到货通知单功能实现

---
 src/views/kanbanManager/cgdd.vue                 |    4 
 src/views/systemSettings/codingRules.vue         |    4 
 src/views/purchasesManager/arrivalNoticeList.vue |  796 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/api/purchasesManager.js                      |   28 ++
 src/router/index.js                              |    6 
 5 files changed, 834 insertions(+), 4 deletions(-)

diff --git a/src/api/purchasesManager.js b/src/api/purchasesManager.js
index bef7325..f206c52 100644
--- a/src/api/purchasesManager.js
+++ b/src/api/purchasesManager.js
@@ -51,3 +51,31 @@
     params: data
   })
 }
+
+/*
+閲囪喘鍒拌揣鍗�
+* */
+// 閲囪喘鍒拌揣鍗曟煡璇�
+export function PurchaseArrivalOrderSearch(data) {
+  return request({
+    url: 'PurchaseOrder/PurchaseArrivalOrderSearch',
+    method: 'get',
+    params: data
+  })
+}
+// 閲囪喘鍒拌揣鍗曟槑缁�
+export function PurchaseArrivalOrderSubSearch(data) {
+  return request({
+    url: 'PurchaseOrder/PurchaseArrivalOrderSubSearch',
+    method: 'get',
+    params: data
+  })
+}
+// 閲囪喘鍒拌揣鍗曞叧闂�
+export function ClosedPurchaseArrivalOrder(data) {
+  return request({
+    url: 'PurchaseOrder/ClosedPurchaseArrivalOrder',
+    method: 'post',
+    params: data
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 46b9571..41b64ee 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -646,6 +646,12 @@
         code: '1201',
         component: () => import('@/views/purchasesManager/purchasesList'),
         meta: { code: '1201', title: '閲囪喘璁㈠崟', icon: '', keepAlive: true }
+      }, {
+        path: 'arrivalNoticeList',
+        name: 'arrivalNoticeListCancel',
+        code: '1202',
+        component: () => import('@/views/purchasesManager/arrivalNoticeList'),
+        meta: { code: '1202', title: '鍒拌揣閫氱煡鍗�', icon: '', keepAlive: true }
       }
     ]
   }
diff --git a/src/views/kanbanManager/cgdd.vue b/src/views/kanbanManager/cgdd.vue
index 7753d21..1b835b4 100644
--- a/src/views/kanbanManager/cgdd.vue
+++ b/src/views/kanbanManager/cgdd.vue
@@ -401,13 +401,13 @@
             divData.scrollTop = 0
             PurchaseRight().then(res => {
               this.tableDataRank = res.data
-              if (this.tableDataRank.length > 21) {
+              if (this.tableDataRank.length > 23) {
                 clearInterval(this.PurchaseRight)
                 this.getPurchaseRight()
               }
             })
           }
-        }, this.tableDataRank.length <= 21 ? 1000 * 3 : 100)
+        }, this.tableDataRank.length <= 23 ? 1000 * 3 : 100)
       })
     },
     tableRowClassName({ row, rowIndex }) {
diff --git a/src/views/purchasesManager/arrivalNoticeList.vue b/src/views/purchasesManager/arrivalNoticeList.vue
new file mode 100644
index 0000000..5c0d816
--- /dev/null
+++ b/src/views/purchasesManager/arrivalNoticeList.vue
@@ -0,0 +1,796 @@
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <!--      <div class="bodyTopButtonGroup" style="justify-content: space-between">-->
+      <!--        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+      <!--        <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+      <!--      </div>-->
+
+      <div class="bodyTopFormGroup" style="margin-top: 10px;">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex;"
+        >
+          <div class="elForm">
+            <el-form-item label="鍗曟嵁鐘舵��" style=" display: flex;">
+              <el-select
+                v-model="form.orderstatus"
+                filterable
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in orderstatusArr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鍒拌揣鍗曞彿" style=" display: flex;">
+              <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="閮ㄩ棬淇℃伅" style=" display: flex;">
+              <el-select
+                v-model="form.departmentcode"
+                filterable
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in departmentcodeArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鍗曟嵁鏃ユ湡" style="display: flex;font-size: 14px;align-items: center">
+              <el-date-picker
+                v-model="form.orderdate"
+                type="daterange"
+                range-separator="~"
+                class="timeMini"
+                size="mini"
+                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+                :clearable="false"
+                start-placeholder="寮�濮嬫棩鏈�"
+                end-placeholder="缁撴潫鏃ユ湡"
+              />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="婧愬崟鍗曞彿" style=" display: flex;">
+              <el-input v-model="form.sourceorder" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="閲囪喘渚涙柟" style=" display: flex;">
+              <el-select
+                v-model="form.customercode"
+                filterable
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in customercodeArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
+              <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="鍒拌揣鏃堕棿" style=" display: flex;font-size: 14px;align-items: center">
+              <el-date-picker
+                v-model="form.arrivaldate"
+                type="daterange"
+                range-separator="~"
+                class="timeMini"
+                size="mini"
+                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+                :clearable="false"
+                start-placeholder="寮�濮嬫棩鏈�"
+                end-placeholder="缁撴潫鏃ユ湡"
+              />
+            </el-form-item>
+          </div>
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+        <div
+          class="bodyTopFormExpand"
+        >
+          <svg-icon
+            v-show="mouseHoverType==='mouseout'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+            @mouseenter="mouseHoverType=$event.type"
+          />
+          <svg-icon
+            v-show="mouseHoverType==='mouseenter'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+            @click="isExpandForm=!isExpandForm"
+            @mouseout="mouseHoverType=$event.type"
+          />
+        </div>
+      </div>
+
+      <div class="elTableDiv">
+        <TableColumnSettings
+          :list1="tableColumnSettingsArray"
+          @tableColumnUpdate="tableColumnUpdate"
+        />
+
+        <el-table
+          ref="tableDataRef"
+          :key="tableTimeStampKey"
+          class="tableFixed"
+          :data="tableData"
+          :height="isExpandForm?(tableHeight):(tableHeight+40)+'px'"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:isExpandForm?(tableHeight):(tableHeight+40)+'px'}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+          @row-click="rowClick"
+        >
+          <el-table-column
+            width="50"
+            fixed
+          >
+            <template slot-scope="{row}">
+              <el-radio
+                v-model="radioSelected"
+                :label="row.hbillno"
+                style="color: transparent;padding-left: 10px;"
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            v-for="item in tableColumnSettingsArray"
+            v-if="item.show"
+            :key="item.id"
+            :sortable="item.sortable"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :label="item.label"
+            :width="item.width"
+            show-tooltip-when-overflow
+            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+          >
+            <template slot-scope="{row}">
+              <div v-if="!row[item.prop]">/</div>
+              <div v-else-if="item.prop==='hbillstaus'">
+                {{ orderstatusArr.find(i => i.value === row[item.prop]).label }}
+              </div>
+              <div v-else-if="item.prop==='hdate'">
+                {{ row.hdate ? row.hdate.substring(0, 11) : '/' }}
+              </div>
+              <div v-else-if="item.prop==='hacceptdate'">
+                {{ row.hacceptdate ? row.hacceptdate.substring(0, 11) : '/' }}
+              </div>
+              <div v-else>{{ row[item.prop] }}</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="鎿嶄綔"
+            width="120"
+            fixed="right"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍏抽棴" placement="top">
+                  <i
+                    class="el-icon-switch-button"
+                    :style="{color:$store.state.settings.theme}"
+                    style=" cursor: pointer"
+                    @click="switchButton(row)"
+                  />
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="total,prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getPurchaseArrivalOrderSearch"
+      />
+
+      <div class="elTableDiv">
+        <el-table
+          ref="tableDataRef2"
+          :data="tableDataDetail"
+          border
+          height="210px"
+          :row-class-name="tableRowClassName"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+        >
+          <el-table-column
+            width="50"
+            type="index"
+            label="搴忓彿"
+            fixed
+          />
+          <el-table-column
+            prop="partcode"
+            label="浜у搧缂栧彿"
+            width="160"
+            show-tooltip-when-overflow
+          />
+          <el-table-column
+            prop="partname"
+            label="浜у搧鍚嶇О"
+            width="200"
+            show-tooltip-when-overflow
+          />
+
+          <el-table-column
+            label="浜у搧瑙勬牸"
+            prop="partspec"
+            show-tooltip-when-overflow
+            width="150"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.partspec">{{ row.partspec }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鍗曚綅"
+            show-tooltip-when-overflow
+            prop="uom_name"
+            width="100"
+          />
+          <el-table-column
+            label="鍒拌揣鏁伴噺"
+            show-tooltip-when-overflow
+            prop="hqty"
+          />
+
+          <el-table-column
+            label="鍏ュ簱鏁伴噺"
+            show-tooltip-when-overflow
+            prop="hqty1"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.hqty1">{{ row.hqty1 }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="閫�璐ф暟閲�"
+            show-tooltip-when-overflow
+            prop="hreturnqty"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.hreturnqty!==null">{{ row.hreturnqty }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="棰勮鍒拌揣鏃ユ湡"
+            show-tooltip-when-overflow
+            prop="hacceptdate"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.hacceptdate">{{ row.hacceptdate.substring(0, 11) }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="浠撳簱"
+            show-tooltip-when-overflow
+            prop="hstorehousename"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.hstorehousename">{{ row.hstorehousename }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鏄惁妫�楠�"
+            show-tooltip-when-overflow
+            prop="hcheckstaus"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.hcheckstaus==='Y'">
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                鏄�
+              </div>
+              <div v-if="row.hcheckstaus==='N'">
+                <i class="el-icon-info" style="margin-right: 2px" />
+                鍚�
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鎿嶄綔"
+            width="120"
+            fixed="right"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-tooltip class="item" effect="dark" content="鏌ョ湅璇︽儏" placement="top">
+                  <i
+                    class="el-icon-view"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;"
+                    @click="$message.info('鏆傛棤鏉冮檺锛�')"
+                  />
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
+import {
+  ClosedPurchaseArrivalOrder,
+  PurchaseArrivalOrderSearch,
+  PurchaseArrivalOrderSubSearch
+} from '@/api/purchasesManager'
+import { DepartMentSelect, PurchSupplierSelect } from '@/api/basicInfo'
+import { handleDatetime } from '@/utils/global'
+
+export default {
+  name: 'Zzjg',
+  components: {
+    Pagination, TableColumnSettings
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        orderstatus: '', // 鍗曟嵁鐘舵��(榛樿鍏ㄩ儴)
+        mesordercode: '', // 鍒拌揣鍗曞彿
+        departmentcode: '', // 閮ㄩ棬缂栫爜
+        customercode: '', // 渚涘簲鍟嗙紪鐮�
+        orderdate: '', // 鍗曟嵁鏃ユ湡
+        sourceorder: '', // 婧愬崟鍗曞彿(閲囪喘璁㈠崟鍙�)
+        creatuser: '', // 鍒涘缓浜哄憳
+        arrivaldate: '', // 棰勮鍒拌揣鏃ユ湡
+        prop: 'hdate', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      orderstatusArr: [// 璁㈠崟鐘舵��
+        { label: '姝ｅ父', value: 'NEW' },
+        { label: '鍏抽棴', value: 'CLOSED' }
+      ],
+      departmentcodeArr: [], // 閮ㄩ棬鏁扮粍
+      customercodeArr: [], // 渚涘簲鍟嗘暟缁�
+      total: 10,
+      tableData: [],
+      tableColumnSettingsArray: [
+        // { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒�  show: false闅愯棌锛宼rue鏄剧ず
+        { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'hbillstaus',
+          label: '璁㈠崟鐘舵��',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'hdate',
+          label: '鍗曟嵁鏃ユ湡',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'hbillno',
+          label: '鍗曟嵁缂栧彿',
+          id: 5,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'hdepartmentcode',
+          label: '閮ㄩ棬鍚嶇О缂栫爜',
+          id: 6,
+          show: false,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'hdepartmentname',
+          label: '閮ㄩ棬鍚嶇О',
+          id: 7,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'hcustomercode',
+          label: '寰�鏉ュ崟浣嶇紪鐮�',
+          id: 8,
+          show: false,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 220,
+          width: false,
+          prop: 'hcustomername',
+          label: '寰�鏉ュ崟浣�',
+          id: 9,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'hsourcebillno',
+          label: '婧愬崟鍗曞彿',
+          id: 10,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 130,
+          width: false,
+          prop: 'hacceptdate',
+          label: '棰勮鍒拌揣鏃堕棿',
+          id: 11,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'usercode',
+          label: '鍒涘缓浜哄憳',
+          id: 12,
+          show: true,
+          fixed: false,
+          sortable: true
+        }
+
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+      radioSelected: '',
+      tableDataDetail: []// 瀛愯〃
+
+    }
+  },
+
+  created() {
+    this.handleRequest()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
+    handleRequest() {
+      this.getPurchaseArrivalOrderSearch().then(res => {
+        if (res.code === '200') {
+          this.getDepartMentSelect()
+          this.getPurchSupplierSelect()
+        }
+      })
+    },
+    async getPurchaseArrivalOrderSearch() {
+      let tempDate2 = this.form.orderdate
+      if (tempDate2.length > 0) {
+        tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+      }
+
+      let tempDate = this.form.arrivaldate
+      if (tempDate.length > 0) {
+        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+      }
+
+      const data = {
+        orderstatus: this.form.orderstatus, // 鍗曟嵁鐘舵��(榛樿鍏ㄩ儴)
+        mesordercode: this.form.mesordercode, // 鍒拌揣鍗曞彿
+        departmentcode: this.form.departmentcode, // 閮ㄩ棬缂栫爜
+        customercode: this.form.customercode, // 渚涘簲鍟嗙紪鐮�
+        orderdate: tempDate2, // 鍗曟嵁鏃ユ湡
+        sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿(閲囪喘璁㈠崟鍙�)
+        creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
+        arrivaldate: tempDate, // 棰勮鍒拌揣鏃ユ湡
+
+        prop: this.form.prop, // 鎺掑簭瀛楁
+        order: this.form.order, // 鎺掑簭瀛楁
+        page: this.form.page, // 绗嚑椤�
+        rows: this.form.rows // 姣忛〉澶氬皯鏉�
+      }
+
+      const res = await PurchaseArrivalOrderSearch(data)
+      this.tableData = res.data
+      this.total = res.count
+
+      return { code: res.code }
+    },
+    // 鑾峰彇閮ㄩ棬淇℃伅
+    async getDepartMentSelect() {
+      const { data: res } = await DepartMentSelect()
+      this.departmentcodeArr = res
+    },
+    async getPurchSupplierSelect() {
+      const { data: res } = await PurchSupplierSelect()
+      this.customercodeArr = res
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getPurchaseArrivalOrderSearch()
+    },
+    //  琛岀偣鍑讳簨浠�
+    async rowClick(row, event, column) {
+      this.radioSelected = row.hbillno
+
+      const { data: res } = await PurchaseArrivalOrderSubSearch({ arrivelodercode: this.radioSelected })
+
+      this.tableDataDetail = res
+    },
+    // 鏌ヨ
+    search() {
+      this.getPurchaseArrivalOrderSearch()
+    },
+
+    // 閲嶇疆
+    reset() {
+      this.form.orderstatus = '', // 鍗曟嵁鐘舵��(榛樿鍏ㄩ儴)
+      this.form.mesordercode = '', // 鍒拌揣鍗曞彿
+      this.form.departmentcode = '', // 閮ㄩ棬缂栫爜
+      this.form.customercode = '', // 渚涘簲鍟嗙紪鐮�
+      this.form.orderdate = '', // 鍗曟嵁鏃ユ湡
+      this.form.sourceorder = '', // 婧愬崟鍗曞彿(閲囪喘璁㈠崟鍙�)
+      this.form.creatuser = '', // 鍒涘缓浜哄憳
+      this.form.arrivaldate = '', // 棰勮鍒拌揣鏃ユ湡
+      this.getPurchaseArrivalOrderSearch()
+    },
+
+    // 鍏抽棴鎸夐挳
+    async switchButton(row) {
+      this.$confirm('鏄惁纭鍏抽棴?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        ClosedPurchaseArrivalOrder({ arrivelodercode: row.hbillno }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍏抽棴鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+            this.getPurchaseArrivalOrderSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝叧闂�')
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 425
+        this.$refs.tableDataRef.doLayout()
+        this.$refs.tableDataRef2.doLayout()
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    }
+  }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+
+::v-deep .el-radio__label {
+  display: none !important;
+}
+
+::v-deep .el-range__icon {
+  line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+  line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+  font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+::v-deep .el-button--text {
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-icon-edit-outline {
+  margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+  //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+  background-color: #f8f8fa;
+  border: none;
+}
+
+::v-deep .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+  //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+  height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
+}
+</style>
+<style>
+
+.el-table .custom-row {
+  background: #f8f8fa;
+}
+</style>
diff --git a/src/views/systemSettings/codingRules.vue b/src/views/systemSettings/codingRules.vue
index d43fa9d..f159583 100644
--- a/src/views/systemSettings/codingRules.vue
+++ b/src/views/systemSettings/codingRules.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
-      <div class="bodyTopFormGroup">
+      <div class="bodyTopFormGroup" style="margin-top: 10px;">
         <el-form
           ref="form"
           :model="form"
@@ -418,7 +418,7 @@
     getHeight() {
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 135
+        this.tableHeight = this.mainHeight - 145
         this.$refs.tableDataRef.doLayout()
       })
     }

--
Gitblit v1.9.3