From e14ed882d12df3b48e59390eba364442cdff70bd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:46:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/tms/InboundOrderList.vue |  241 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 241 insertions(+), 0 deletions(-)

diff --git a/src/views/tms/InboundOrderList.vue b/src/views/tms/InboundOrderList.vue
new file mode 100644
index 0000000..214521c
--- /dev/null
+++ b/src/views/tms/InboundOrderList.vue
@@ -0,0 +1,241 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 鏌ヨ鍖哄煙 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="鍏ュ簱鐢宠鍗曠紪鍙�">
+              <a-input placeholder="璇疯緭鍏ュ叆搴撶敵璇峰崟缂栧彿" v-model="queryParam.inboundNum" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+              <a-form-item label="鍏ュ簱绫诲瀷">
+                <j-search-select-tag
+                  placeholder="璇烽�夋嫨鍏ュ簱绫诲瀷"
+                  v-model="queryParam.inStorehouseType"
+                  dict="in_storehouse_type"
+                />
+              </a-form-item>
+            </a-col>
+          <a-col :md="6" :sm="8">
+              <a-form-item label="缁忔墜浜�">
+                <j-search-select-tag
+                  placeholder="璇烽�夋嫨缁忔墜浜�"
+                  v-model="queryParam.handler"
+                  dict="sys_user,realname,id,del_flag!=1"
+                />
+              </a-form-item>
+            </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+    <div class="table-operator">
+      <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+      <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+    </div>
+
+    <!-- table鍖哄煙-begin -->
+    <a-table
+      ref="table"
+      size="middle"
+      bordered
+      rowKey="id"
+      :customRow="customRow"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :loading="loading"
+      @change="handleTableChange"
+    >
+      <!--鐘舵�佹爮涓�у睍绀�-->
+      <span slot="action" slot-scope="text, record">
+        <a href="javascript:;" @click="handleEdit(record)" v-if="record.orderStatus == '1'">缂栬緫</a>
+        <a-divider type="vertical" v-if="record.orderStatus == '1'" />
+        <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
+        <a-divider type="vertical"  v-if="record.orderStatus == '1'"/>
+        <a href="javascript:;" @click="handleSubmit(record)" v-if="record.orderStatus == '1'">鎻愪氦</a>
+      </span>
+    </a-table>
+    <a-tabs defaultActiveKey="1">
+      <a-tab-pane tab="宸ュ叿鍏ュ簱鏄庣粏" key="1">
+        <inbound-detail-list ref="inboundDetailList"></inbound-detail-list>
+      </a-tab-pane>
+    </a-tabs>
+    <!-- table鍖哄煙-end -->
+    <inbound-order-model ref="modalForm" @ok="modalFormOk"></inbound-order-model>
+  </a-card>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import InboundOrderModel from './modules/inboundOrder/InboundOrderModel'
+import InboundDetailList from './modules/inboundOrder/InboundDetailList'
+import { requestPut } from '@/api/manage'
+import JDictSelectTag from '@/components/dict/JDictSelectTag'
+import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
+import { postAction,getAction } from '../../api/manage'
+
+export default {
+  name: 'InboundOrderList',
+  mixins: [JeecgListMixin],
+  components: {
+    InboundOrderModel,
+    InboundDetailList,
+    JDictSelectTag,
+    JSearchSelectTag,
+  },
+  data() {
+    return {
+      description: '鍏ュ簱鐢宠鍗�',
+      url: {
+        list: '/tms/inboundOrder/list',
+        importExcelUrl: '/tms/inboundOrder/importExcel',
+        exportXlsUrl: '/tms/inboundOrder/exportXls',
+        edit:'/tms/inboundOrder/edit',
+        submit:'/tms/inboundOrder/submit'
+      },
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          },
+        },
+        {
+          title: '鍏ュ簱鐢宠鍗曠紪鍙�',
+          align: 'center',
+          dataIndex: 'inboundNum',
+          sorter: true,
+        },
+        {
+          title: '鍏ュ簱鍗曠被鍨�',
+          align: 'center',
+          dataIndex: 'inStorehouseType_dictText',
+        },
+        {
+          title: '缁忔墜浜�',
+          align: 'center',
+          dataIndex: 'handler_dictText',
+        },
+        {
+          title: '鐢宠鍘熷洜',
+          align: 'center',
+          dataIndex: 'applicationReason',
+        },
+        {
+          title: '鍏ュ簱鏃堕棿',
+          align: 'center',
+          dataIndex: 'inboundTime',
+          sorter: true,
+        },
+        {
+          title: '瀹℃牳浜�',
+          align: 'center',
+          dataIndex: 'reviewer_dictText',
+        },
+        {
+          title: '瀹℃牳鏃堕棿',
+          align: 'center',
+          dataIndex: 'approvalDate',
+          sorter: true,
+        },
+        {
+          title: '瀹℃牳鐘舵��',
+          align: 'center',
+          dataIndex: 'orderStatus_dictText',
+        },
+         {
+          title: '鍊熺敤鍗曞彿',
+          align: 'center',
+          dataIndex: 'borrowNum',
+        },
+         {
+          title: '瀹℃壒鎰忚',
+          align: 'center',
+          dataIndex: 'approvalOpinion',
+        },
+        {
+          width: 150,
+          title: '鎿嶄綔',
+          dataIndex: 'action',
+          align: 'center',
+          scopedSlots: { customRender: 'action' },
+        },
+      ],
+    }
+  },
+  computed: {
+    /* 瀵煎叆璺緞椤甸潰閲嶆柊璁$畻 */
+    importExcelUrl: function () {
+      //  return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;//寮�鍙戠幆澧冩寚鍚�
+      return `${window._CONFIG['hxFileURL']}/${this.url.importExcelUrl}`
+    },
+  },
+  methods: {
+    searchReset() {
+      this.queryParam = {}
+      this.$refs.inboundDetailList.dataSource = []
+      this.loadData(1);
+    },
+    customRow(record) {
+      return {
+        on: {
+          click: (e) => {
+            //灏嗗綋鍓嶉�変腑鐨勮褰曚紶鍒板瓙椤甸潰
+            this.$bus.$emit('getToolingStorageData', record)
+            //鐐瑰嚮褰撳墠琛屽彉鑹�
+            let oldList = document.querySelectorAll('.checked-td-of-add-table')
+            if (oldList) {
+              for (let j = 0; j < oldList.length; j++) {
+                oldList[j].classList.remove('checked-td-of-add-table')
+              }
+            }
+            let children = e.target.parentNode.children
+            for (let i = 0; i < children.length; i++) {
+              children[i].classList.add('checked-td-of-add-table')
+            }
+          },
+        },
+      }
+    },
+    handleEdit: function (record) {
+        this.$refs.modalForm.edit(record)
+        this.$refs.modalForm.title = '缂栬緫'
+        this.$refs.modalForm.disableSubmit = false
+    },
+    handleAdd() {
+      this.$refs.modalForm.add()
+      this.$refs.modalForm.title = '鏂板'
+      this.$refs.modalForm.disableSubmit = false
+    },
+    handleSubmit(record) {
+        let that = this;
+        getAction(that.url.submit, { id:record.id}).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.loadData();
+          } else {
+            that.$message.warning(res.message);
+          }
+        })
+      },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+/deep/ .notshow {
+  display: none;
+}
+/deep/ .checked-td-of-add-table {
+  background-color: rgba(220, 220, 220, 1);
+}
+</style>
\ No newline at end of file

--
Gitblit v1.9.3