From ff16dc69b0ec8688669f2a87adb8d12ccfd7c31a Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 27 十一月 2025 16:50:12 +0800
Subject: [PATCH] 生产汇报单

---
 src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue |  929 ++++++++++++++++++++
 src/views/gyMaterial/GyMaterial.vue                      |    6 
 src/store/modules/permission.js                          |   39 
 src/router/index.js                                      |   25 
 src/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue | 1649 ++++++++++++++++++++++++++++++++++++
 5 files changed, 2,645 insertions(+), 3 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 24b8c27..ab9d50d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1250,6 +1250,31 @@
       },
     ],
   },
+  // 鐢熶骇姹囨姤鍗曠淮鎶�
+  {
+    path: "/icmo/scICMOReportBill/scICMOReportBillList",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/icmo/scICMOReportBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/icmo/scICMOReportBill/scICMOReportBillList",
+        component: () => import("@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"),
+        name: "ScICMOBillList",
+        meta: { title: "鐢熶骇姹囨姤鍗曠淮鎶�", activeMenu: "/icmo/scICMOReportBill" },
+      },
+      // {
+      //   path: "/icmo/scIcmoBill/scIcmoBillEdit",
+      //   component: () => import("@/views/ICMO/ScICMOBillEdit.vue"),
+      //   name: "ScICMOBillEdit",
+      //   meta: { title: "鐢熶骇璁㈠崟", activeMenu: "/icmo/scIcmoBill" },
+      // },
+    ],
+  },
 ];
 
 // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 22d0eaa..756a8a8 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -895,6 +895,45 @@
                   },
                 ],
               },
+              {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "鐢熶骇姹囨姤",
+                },
+                hidden: false,
+                name: "ScICMOReportBill",
+                path: "scICMOReportBill",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鐢熶骇姹囨姤鍒楄〃",
+                    },
+                    component: () => import("@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"),
+                    hidden: false,
+                    name: "ScICMOReportBillList",
+                    path: "scICMOReportBillList",
+                  },
+                  // {
+                  //   meta: {
+                  //     icon: "build",
+                  //     link: null,
+                  //     noCache: false,
+                  //     title: "鐢熶骇鍏ュ簱鍗�",
+                  //   },
+                  //   component: () => import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
+                  //   hidden: false,
+                  //   name: "ProductInBillEdit",
+                  //   path: "ProductInBillEdit",
+                  // },
+                ],
+              },
             ],
           },
           {
diff --git a/src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue b/src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue
new file mode 100644
index 0000000..4ad5ebb
--- /dev/null
+++ b/src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue
@@ -0,0 +1,929 @@
+<template>
+  <div v-loading="formLoading" style="padding: 20px">
+    <div class="operation-buttons">
+      <el-button-group>
+        <el-button type="primary" @click="handleAdd">鏂板</el-button>
+        <el-button type="primary" @click="handleCopyBill">澶嶅埗</el-button>
+        <el-button type="primary" @click="handleCheckBill">瀹℃牳</el-button>
+        <el-button type="primary" @click="handleAbandonCheck">鍙嶅鏍�</el-button>
+        <el-button type="primary" @click="handleDeleteBill">鍒犻櫎</el-button>
+        <el-button type="primary" @click="handlePrint">鎵撳嵃</el-button>
+        <el-button type="primary" @click="handleSave" :disabled="saveDisabled">淇濆瓨</el-button>
+        <el-button type="primary" @click="handleExit">閫�鍑�</el-button>
+      </el-button-group>
+    </div>
+    <div class="page-title">
+      <h1>鐢熶骇姹囨姤鍗�</h1>
+    </div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="basic">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+                <el-input v-model="form.HBillNo" readonly />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鏃ユ湡" prop="HDate">
+                <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鐢熶骇杞﹂棿" prop="HDeptName">
+                <el-input v-model="form.HDeptName" readonly>
+                  <el-button slot="append" icon="el-icon-search" @click="openDeptDialog"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="鐝粍" prop="HGroupName">
+                <el-input v-model="form.HGroupName" readonly>
+                  <el-button slot="append" icon="el-icon-search" @click="openGroupDialog"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="缁熻鍛�" prop="HEmpName">
+                <el-input v-model="form.HEmpName" readonly>
+                  <el-button slot="append" icon="el-icon-search" @click="openEmpDialog"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="婧愬崟绫诲瀷" prop="HMainSourceBillType">
+                <el-select v-model="form.HMainSourceBillType" @change="handleSourceTypeChange">
+                  <el-option label="鐢熶骇浠诲姟鍗�" value="2"></el-option>
+                  <el-option label="鎵嬪伐褰曞叆" value="1"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="閫夊崟鍙�" prop="HMainSourceBillNo">
+                <el-input v-model="form.HMainSourceBillNo" :disabled="sourceBillDisabled" readonly>
+                  <el-button slot="append" icon="el-icon-search" @click="openSourceBillDialog"
+                    :disabled="sourceBillBtnDisabled"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍒跺崟淇℃伅" name="maker">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="鍒跺崟浜�">
+                <el-input v-model="form.HMaker" readonly />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="瀹℃牳浜�">
+                <el-input v-model="form.HChecker" readonly />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍏抽棴浜�">
+                <el-input v-model="form.HCloseMan" readonly />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="闄勪欢淇℃伅" name="attachment">
+          <el-upload class="upload-demo" action="/api/upload" :on-preview="handlePreview" :on-remove="handleRemove"
+            :before-remove="beforeRemove" multiple :limit="3" :on-exceed="handleExceed" :file-list="fileList">
+            <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+            <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+          </el-upload>
+        </el-tab-pane>
+      </el-tabs>
+      <el-tabs v-model="detailTab">
+        <el-tab-pane label="鐢熶骇姹囨姤鍗�" name="main">
+          <div class="table-toolbar">
+            <el-button type="primary" size="small" @click="addTableRow">澧炲姞涓�琛�</el-button>
+            <el-button type="primary" size="small" @click="copyTableRow">澶嶅埗涓�琛�</el-button>
+          </div>
+
+          <el-table :data="tableData" border style="width: 100%" height="400" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
+            <el-table-column prop="HMaterCode" label="鐗╂枡浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMaterCode" @focus="openMaterialDialog(scope.row, scope.$index)" readonly>
+                </el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="HMaterName" label="鐗╂枡鍚嶇О" width="150"></el-table-column>
+            <el-table-column prop="HMaterSpec" label="瑙勬牸鍨嬪彿" width="150"></el-table-column>
+            <el-table-column prop="HUnitCode" label="鍗曚綅浠g爜" width="100">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HUnitCode" @focus="openUnitDialog(scope.row, scope.$index)" readonly>
+                </el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="HUnitName" label="鍗曚綅鍚嶇О" width="100"></el-table-column>
+            <el-table-column prop="HSourceCode" label="璧勬簮浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSourceCode" @focus="openSourceDialog(scope.row, scope.$index)" readonly>
+                </el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="HSourceName" label="璧勬簮鍚嶇О" width="150"></el-table-column>
+            <el-table-column prop="HWorkerCode" label="鎿嶄綔鍛樹唬鐮�" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HWorkerCode" @focus="openWorkerDialog(scope.row, scope.$index)" readonly>
+                </el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="HWorkerName" label="鎿嶄綔鍛樺悕绉�" width="150"></el-table-column>
+            <el-table-column prop="HQty" label="鐢熶骇鏁伴噺" width="100">
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.HQty" :min="0" :precision="2" controls-position="right" size="mini">
+                </el-input-number>
+              </template>
+            </el-table-column>
+            <el-table-column prop="HBadQty" label="涓嶈壇鏁伴噺" width="100">
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.HBadQty" :min="0" :precision="2" controls-position="right"
+                  size="mini">
+                </el-input-number>
+              </template>
+            </el-table-column>
+            <el-table-column prop="HICMOBillNo" label="鐢熶骇璁㈠崟" width="120"></el-table-column>
+            <el-table-column prop="HPRODUCEDATE" label="鐢熶骇鏃ユ湡" width="120">
+              <template slot-scope="scope">
+                <el-date-picker v-model="scope.row.HPRODUCEDATE" type="date" placeholder="閫夋嫨鏃ユ湡"
+                  value-format="yyyy-MM-dd" size="mini">
+                </el-date-picker>
+              </template>
+            </el-table-column>
+            <el-table-column prop="HRemark" label="琛ㄤ綋澶囨敞" width="150">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HRemark" size="mini"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="鎿嶄綔" width="80">
+              <template slot-scope="scope">
+                <el-button type="danger" size="mini" @click="deleteTableRow(scope.$index)">鍒犻櫎</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+
+        <el-tab-pane label="浜ч噺姹囨姤鍗曟槑缁�" name="production">
+          <el-table :data="productionData" border height="400">
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+    </el-form>
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="80%" append-to-body>
+      <component :is="currentDialogComponent" @select="handleDialogSelect" @dbSelect="handleDialogDbSelect">
+      </component>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">鍙栨秷</el-button>
+        <el-button type="primary" @click="confirmDialogSelect">纭畾</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import Dept from "@/views/component/dept";
+
+export default {
+  name: 'ProductionReport',
+  components: {
+    Dept,
+
+  },
+  props: {
+    propOperationType: { type: Number, default: null },
+    propLinterid: { type: [Number, String], default: null },
+    propHSouceBillType: { type: String, default: '' },
+    propCopyType: { type: Number, default: -1 }
+  },
+  data() {
+    return {
+      formLoading: false,
+      saveDisabled: false,
+      activeTab: 'basic',
+      detailTab: 'main',
+      dialogVisible: false,
+      dialogTitle: '',
+      currentDialogComponent: null,
+      currentDialogType: '',
+      currentRowIndex: null,
+      currentRow: null,
+      fileList: [],
+      sourceBillDisabled: false,
+      sourceBillBtnDisabled: true,
+
+      form: {
+        HBillNo: '',
+        HDate: '',
+        HDeptName: '',
+        HDeptID: 0,
+        HDeptNumber: '',
+        HGroupName: '',
+        HGroupID: 0,
+        HEmpName: '',
+        HEmpID: 0,
+        HMainSourceBillType: '1',
+        HMainSourceBillNo: '',
+        HMainSourceInterID: 0,
+        HMainSourceEntryID: 0,
+        HRemark: '',
+        HMaker: '',
+        HChecker: '',
+        HCloseMan: '',
+        HMakeDate: '',
+        HCheckDate: '',
+        HCloseDate: '',
+        HUpDater: '',
+        HDeleteMan: '',
+        HUpDateDate: '',
+        HDeleteDate: ''
+      },
+
+      rules: {
+        HDeptName: [{ required: true, message: '鐢熶骇杞﹂棿涓嶈兘涓虹┖', trigger: 'blur' }],
+        HGroupName: [{ required: true, message: '鐝粍涓嶈兘涓虹┖', trigger: 'blur' }],
+        HEmpName: [{ required: true, message: '缁熻鍛樹笉鑳戒负绌�', trigger: 'blur' }],
+        HDate: [{ required: true, message: '鏃ユ湡涓嶈兘涓虹┖', trigger: 'change' }]
+      },
+
+      tableData: [],
+      productionData: [],
+
+      OperationType: 1,
+      linterid: 0,
+      HSouceBillType: '',
+
+      baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/'
+    }
+  },
+
+  created() {
+    this.initData()
+  },
+  watch: {
+    form: {
+      handler(newVal) {
+        console.log('琛ㄥ崟鏁版嵁鍙樺寲:', newVal)
+      },
+      deep: true,
+      immediate: true
+    },
+    'form.HDeptName': function (newVal) {
+      console.log('HDeptName鍙樺寲:', newVal)
+    },
+    'form.HGroupName': function (newVal) {
+      console.log('HGroupName鍙樺寲:', newVal)
+    },
+    'form.HEmpName': function (newVal) {
+      console.log('HEmpName鍙樺寲:', newVal)
+    }
+  },
+  methods: {
+    async initData() {
+      
+      const params = this.$route ? this.$route.query : {}
+      if (this.propOperationType !== null && this.propOperationType !== undefined) {
+        this.OperationType = this.propOperationType
+      } else {
+        this.OperationType = params.OperationType || 1
+      }
+
+      if (this.propLinterid !== null && this.propLinterid !== undefined && this.propLinterid !== '') {
+        this.linterid = Number(this.propLinterid)
+      } else {
+        this.linterid = params.linterid || 0
+      }
+
+      this.HSouceBillType = this.propHSouceBillType || params.HSouceBillType || ''
+
+      console.log("鎿嶄綔鍙傛暟:", {
+        OperationType: this.OperationType,
+        linterid: this.linterid,
+        HSouceBillType: this.HSouceBillType
+      })
+
+      try {
+        if (this.OperationType === 1) {
+          await this.setAddFNew()
+        } else if (this.OperationType === 2) {
+          await this.setAddNew()
+        } else if (this.OperationType === 3) {
+          await this.setEditFromGrid()
+        } else if (this.OperationType === 5) {
+          await this.setCopyBill()
+        }
+        if (this.OperationType === 1 || this.OperationType === 2) {
+          this.$set(this.form, 'HDeptID', sessionStorage.HDeptID || 0)
+          this.$set(this.form, 'HDeptName', sessionStorage.HDept || '')
+          this.$set(this.form, 'HGroupID', sessionStorage.HGroupID || 0)
+          this.$set(this.form, 'HGroupName', sessionStorage.HGroup || '')
+          this.$set(this.form, 'HEmpID', sessionStorage.HEmpID || 0)
+          this.$set(this.form, 'HEmpName', sessionStorage.HEmpName || '')
+        } 
+
+      } catch (error) {
+
+        this.$message.error('鍒濆鍖栨暟鎹け璐�: ' + error.message)
+      }
+
+    },
+
+    // 鏃犳簮鍗曟柊澧�
+    async setAddFNew() {
+      await this.getMaxBillNo()
+      this.sourceBillDisabled = false
+      this.sourceBillBtnDisabled = true
+
+      this.tableData = [this.getEmptyRow()]
+    },
+
+    // 鏈夋簮鍗曟柊澧�
+    async setAddNew() {
+      await this.getMaxBillNo()
+
+      if (this.linterid && this.HSouceBillType === '3724') {
+        try {
+          const response = await axios.get('/api/Sc_ICMOReportBill/GetProdReportBillList', {
+            params: {
+              HInterID: this.linterid,
+              user: sessionStorage.HUserName
+            }
+          })
+
+          if (response.data.code === 1) {
+            const data = response.data.data.h_p_Sc_ICMOBillWorkQtyStatus_TmpList1
+            this.tableData = data.map(item => ({
+              HMaterID: item.鐗╂枡ID,
+              HMaterCode: item.鐗╂枡浠g爜,
+              HMaterName: item.鐗╂枡鍚嶇О,
+              HMaterSpec: item.瑙勬牸鍨嬪彿,
+              HUnitID: item.鍗曚綅ID,
+              HUnitCode: item.璁¢噺鍗曚綅浠g爜,
+              HUnitName: item.璁¢噺鍗曚綅,
+              HSourceID: item.鐢熶骇璧勬簮ID,
+              HSourceCode: item.鐢熶骇璧勬簮浠g爜,
+              HSourceName: item.鐢熶骇璧勬簮鍚嶇О,
+              HWorkerid: item.鎿嶄綔鍛業D,
+              HWorkerCode: item.鎿嶄綔鍛樹唬鐮�,
+              HWorkerName: item.鎿嶄綔鍛樺悕绉�,
+              HQty: item.浜ч噺,
+              HBadQty: item.涓嶈壇鏁伴噺 || 0,
+              HICMOBillNo: item.鐢熶骇璁㈠崟鍙�,
+              HICMOInterID: item.HICMOInterID,
+              HICMOEntryID: item.HICMOEntryID,
+              HPRODUCEDATE: item.鐢熶骇鏃ユ湡,
+              HRemark: ''
+            }))
+          }
+        } catch (error) {
+          this.$message.error('鑾峰彇婧愬崟鏁版嵁澶辫触')
+        }
+      } else {
+        this.tableData = [this.getEmptyRow()]
+      }
+    },
+
+    // 缂栬緫
+    async setEditFromGrid() {
+      await this.setEditForm(this.linterid)
+      await this.setEditGrid(this.linterid)
+    },
+
+    // 澶嶅埗
+    async setCopyBill() {
+      await this.setEditFromGrid()
+      await this.getMaxBillNo()
+
+      this.form.HMaker = sessionStorage.HUserName
+      this.form.HMakeDate = this.formatDate(new Date())
+      this.form.HUpDater = ''
+      this.form.HUpDateDate = ''
+      this.form.HChecker = ''
+      this.form.HCheckDate = ''
+      this.form.HCloseMan = ''
+      this.form.HCloseDate = ''
+      this.form.HDeleteMan = ''
+      this.form.HDeleteDate = ''
+    },
+    // 鑾峰彇鏈�澶у崟鎹彿
+    async getMaxBillNo() {
+      try {
+        const response = await axios.get(`${this.baseURL}/Web/GetMAXNum`, {
+          params: { HBillType: '3711' }
+        })
+        if (response.data && response.data.data && response.data.data.length > 0) {
+          this.form.HBillNo = response.data.data[0].HBillNo
+          this.form.HInterID = response.data.data[0].HInterID
+          this.form.HDate = this.formatDate(new Date())
+          this.form.HMakeDate = this.formatDate(new Date())
+          this.form.HMaker = sessionStorage.HUserName
+        }
+      } catch (error) {
+        console.error('鑾峰彇鍗曟嵁鍙峰け璐�:', error)
+        this.$message.error('鑾峰彇鍗曟嵁鍙峰け璐�')
+      }
+    },
+    // 缂栬緫鑾峰彇琛ㄥご
+    async setEditForm(linterid) {
+      console.log("neima", linterid)
+      try {       //'/api/Sc_ICMOReportBill/Sc_GetICMOReportBillListCheckDetai'
+        const response = await axios.get(`${this.baseURL}/Sc_ICMOReportBill/Sc_GetICMOReportBillListCheckDetai`, {
+          params: { HID: linterid }
+        })
+
+        if (response.data.code === 1) {
+          const data = response.data.data.h_v_IF_ICMOReportBillList_Edit[0]
+          this.form.HBillNo = data.鍗曟嵁鍙�
+          this.form.HDate = this.formatDate(data.鏃ユ湡)
+          this.form.HDeptID = data.HDeptID
+          this.form.HDeptName = data.閮ㄩ棬
+          this.form.HDeptNumber = data.閮ㄩ棬浠g爜
+          this.form.HGroupID = data.HGroupID
+          this.form.HGroupName = data.鐝粍
+          this.form.HEmpID = data.HEmpID
+          this.form.HEmpName = data.缁熻鍛�
+          this.form.HMainSourceBillNo = data.HMainSourceBillNo
+          this.form.HMainSourceInterID = data.HMainSourceInterID || 0
+          this.form.HMainSourceEntryID = data.HMainSourceEntryID || 0
+          this.form.HRemark = data.琛ㄥご澶囨敞
+          console.log("response", data.鍗曟嵁鍙�, "---", data.閮ㄩ棬, "----", data.缁熻鍛�)
+        }
+      } catch (error) {
+        this.$message.error('鑾峰彇琛ㄥ崟鏁版嵁澶辫触')
+      }
+    },
+
+    // 缂栬緫鑾峰彇琛ㄤ綋
+    async setEditGrid(linterid) {
+      this.form.HInterID = linterid
+
+      try {//Sc_ICMOReportBill/Sc_ICMOReportBillListProjectDetai
+        const response = await axios.get(`${this.baseURL}/Sc_ICMOReportBill/Sc_ICMOReportBillListProjectDetai`, {
+          params: { sqlWhere: `and hmainid=${linterid}` }
+        })
+
+        if (response.data.count === 1) {
+          this.tableData = response.data.data
+        }
+      } catch (error) {
+        this.$message.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触')
+      }
+    },
+
+    handleSourceTypeChange(value) {
+      if (value === '1') {
+        this.sourceBillDisabled = false
+        this.sourceBillBtnDisabled = true
+        this.OperationType = 1
+      } else if (value === '2') {
+        this.sourceBillDisabled = true
+        this.sourceBillBtnDisabled = false
+        this.OperationType = 2
+      }
+    },
+
+    openDeptDialog() {
+      this.dialogTitle = '閮ㄩ棬鍒楄〃'
+      this.currentDialogComponent = 'Dept'
+      this.currentDialogType = 'dept'
+      this.dialogVisible = true
+    },
+
+    openGroupDialog() {
+      this.dialogTitle = '鐝粍鍒楄〃'
+      this.currentDialogComponent = 'Group'
+      this.currentDialogType = 'group'
+      this.dialogVisible = true
+    },
+
+    openEmpDialog() {
+      this.dialogTitle = '鑱屽憳鍒楄〃'
+      this.currentDialogComponent = 'Employee'
+      this.currentDialogType = 'emp'
+      this.dialogVisible = true
+    },
+
+    openSourceBillDialog() {
+      this.dialogTitle = '鐢熶骇浠诲姟鍗曞垪琛�'
+      this.currentDialogComponent = 'ProductionOrder'
+      this.currentDialogType = 'sourceBill'
+      this.dialogVisible = true
+    },
+
+    openMaterialDialog(row, index) {
+      this.currentRow = row
+      this.currentRowIndex = index
+      this.dialogTitle = '鐗╂枡鍒楄〃'
+      this.currentDialogComponent = 'Material'
+      this.currentDialogType = 'material'
+      this.dialogVisible = true
+    },
+
+    openUnitDialog(row, index) {
+      this.currentRow = row
+      this.currentRowIndex = index
+      this.dialogTitle = '鍗曚綅鍒楄〃'
+      this.currentDialogComponent = 'Unit'
+      this.currentDialogType = 'unit'
+      this.dialogVisible = true
+    },
+
+    openSourceDialog(row, index) {
+      this.currentRow = row
+      this.currentRowIndex = index
+      this.dialogTitle = '璧勬簮鍒楄〃'
+      this.currentDialogComponent = 'Source'
+      this.currentDialogType = 'source'
+      this.dialogVisible = true
+    },
+
+    openWorkerDialog(row, index) {
+      this.currentRow = row
+      this.currentRowIndex = index
+      this.dialogTitle = '鑱屽憳鍒楄〃'
+      this.currentDialogComponent = 'Employee'
+      this.currentDialogType = 'worker'
+      this.dialogVisible = true
+    },
+
+    handleDialogSelect(data) {
+      this.selectedData = data
+    },
+
+    handleDialogDbSelect(data) {
+      this.applySelectedData(data)
+      this.dialogVisible = false
+    },
+
+    confirmDialogSelect() {
+      if (this.selectedData) {
+        this.applySelectedData(this.selectedData)
+        this.dialogVisible = false
+      }
+    },
+
+    applySelectedData(data) {
+      switch (this.currentDialogType) {
+        case 'dept':
+          this.form.HDeptName = data.閮ㄩ棬鍚嶇О
+          this.form.HDeptID = data.HItemID
+          this.form.HDeptNumber = data.閮ㄩ棬浠g爜
+          break
+        case 'group':
+          this.form.HGroupName = data.鐝粍鍚嶇О
+          this.form.HGroupID = data.HItemID
+          break
+        case 'emp':
+          this.form.HEmpName = data.鑱屽憳鍚嶇О
+          this.form.HEmpID = data.HItemID
+          break
+        case 'sourceBill':
+          this.handleSourceBillSelect(data)
+          break
+        case 'material':
+          if (this.currentRow) {
+            this.currentRow.HMaterID = data.HItemID
+            this.currentRow.HMaterCode = data.鐗╂枡浠g爜
+            this.currentRow.HMaterName = data.鐗╂枡鍚嶇О
+            this.currentRow.HMaterSpec = data.瑙勬牸鍨嬪彿
+            this.currentRow.HUnitID = data.HUnitID
+            this.currentRow.HUnitCode = data.璁¢噺鍗曚綅浠g爜
+            this.currentRow.HUnitName = data.璁¢噺鍗曚綅鍚嶇О
+          }
+          break
+        case 'unit':
+          if (this.currentRow) {
+            this.currentRow.HUnitID = data.HItemID
+            this.currentRow.HUnitCode = data.璁¢噺鍗曚綅浠g爜
+            this.currentRow.HUnitName = data.璁¢噺鍗曚綅鍚嶇О
+          }
+          break
+        case 'source':
+          if (this.currentRow) {
+            this.currentRow.HSourceID = data.HItemID
+            this.currentRow.HSourceCode = data.鐢熶骇璧勬簮浠g爜
+            this.currentRow.HSourceName = data.鐢熶骇璧勬簮鍚嶇О
+          }
+          break
+        case 'worker':
+          if (this.currentRow) {
+            this.currentRow.HWorkerid = data.HItemID
+            this.currentRow.HWorkerCode = data.鑱屽憳浠g爜
+            this.currentRow.HWorkerName = data.鑱屽憳鍚嶇О
+          }
+          break
+      }
+    },
+
+    handleSourceBillSelect(data) {
+      if (!Array.isArray(data)) data = [data]
+
+      const billNos = data.map(item => item.鍗曟嵁鍙�)
+      if (!this.isAllEqual(billNos)) {
+        this.$message.error('璇烽�夋嫨鐩稿悓鍗曞彿!')
+        return
+      }
+
+      this.form.HMainSourceBillNo = data[0].鍗曟嵁鍙�
+      this.form.HMainSourceInterID = data[0].hmainid
+      this.form.HMainSourceEntryID = data[0].HEntryID
+
+      const newRows = data.map(item => ({
+        HMaterID: item.HMaterID,
+        HMaterCode: item.HMaterCode,
+        HMaterName: item.HMaterName,
+        HMaterSpec: item.HMaterSpec,
+        HUnitID: item.HUnitID,
+        HUnitCode: item.HUnitCode,
+        HUnitName: item.HUnitName,
+        HSourceID: 0,
+        HSourceCode: '',
+        HSourceName: '',
+        HWorkerid: 0,
+        HWorkerCode: '',
+        HWorkerName: '',
+        HQty: 0,
+        HBadQty: 0,
+        HICMOBillNo: item.鍗曟嵁鍙�,
+        HICMOInterID: item.hmainid,
+        HICMOEntryID: item.HEntryID,
+        HRemark: '',
+        HSourceInterID: item.hmainid,
+        HSourceEntryID: item.HEntryID,
+        HSourceBillNo: item.鍗曟嵁鍙�,
+        HSourceBillType: 3710
+      }))
+
+      this.tableData = newRows
+    },
+
+    addTableRow() {
+      this.tableData.push(this.getEmptyRow())
+    },
+
+    copyTableRow() {
+      if (this.selectedRows && this.selectedRows.length === 1) {
+        const copyRow = JSON.parse(JSON.stringify(this.selectedRows[0]))
+        this.tableData.push(copyRow)
+      } else {
+        this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹繘琛屽鍒�')
+      }
+    },
+
+    deleteTableRow(index) {
+      if (this.tableData.length <= 1) {
+        this.$message.warning('鑷冲皯淇濈暀涓�琛屾暟鎹�')
+        return
+      }
+      this.tableData.splice(index, 1)
+    },
+
+    handleSelectionChange(selection) {
+      this.selectedRows = selection
+    },
+
+
+    getEmptyRow() {
+      return {
+        HMaterID: 0,
+        HMaterCode: '',
+        HMaterName: '',
+        HMaterSpec: '',
+        HUnitID: 0,
+        HUnitCode: '',
+        HUnitName: '',
+        HSourceID: 0,
+        HSourceCode: '',
+        HSourceName: '',
+        HWorkerid: 0,
+        HWorkerCode: '',
+        HWorkerName: '',
+        HQty: 0,
+        HBadQty: 0,
+        HICMOBillNo: '',
+        HICMOInterID: '0',
+        HICMOEntryID: '0',
+        HRemark: '',
+        HSourceInterID: 0,
+        HSourceEntryID: 0,
+        HSourceBillNo: '',
+        HSourceBillType: 0,
+        HICMOTempID: 0,
+        HPRODUCEDATE: ''
+      }
+    },
+
+    // 淇濆瓨
+    async handleSave() {
+      try {
+        await this.$refs.form.validate()
+
+        if (!this.validateForm()) {
+          return
+        }
+
+        const refSav = this.OperationType === 3 ? 'Update' : 'Add'
+        const mainData = {
+          ...this.form,
+          HMaker: sessionStorage.HUserName
+        }
+
+        const rowData = this.tableData.filter(row =>
+          row.HMaterCode && row.HMaterName
+        ).map(row => ({
+          ...row,
+          HMaterName: row.HMaterName.replace(/"/g, '鈥�').replace(/;/g, '锛�'),
+          HMaterSpec: row.HMaterSpec.replace(/"/g, '鈥�').replace(/;/g, '锛�')
+        }))
+
+        const submitData = {
+          main: JSON.stringify(mainData),
+          detail: JSON.stringify(rowData),
+          operation: refSav,
+          user: sessionStorage.HUserName
+        }
+
+        const response = await axios.post('/api/Sc_ICMOReportBill/SaveGetICMOReportBillList', submitData)
+
+        if (response.data.count === 1) {
+          this.$message.success(response.data.Message)
+          this.saveDisabled = true
+        } else {
+          this.$message.error(response.data.Message)
+        }
+      } catch (error) {
+        this.$message.error('淇濆瓨澶辫触')
+      }
+    },
+
+
+    validateForm() {
+      if (!this.form.HDeptID) {
+        this.$message.error('杞﹂棿涓嶈兘涓虹┖!')
+        return false
+      }
+
+      if (!this.form.HGroupID) {
+        this.$message.error('鐝粍涓嶈兘涓虹┖!')
+        return false
+      }
+
+      if (!this.form.HEmpID) {
+        this.$message.error('缁熻鍛樹笉鑳戒负绌�!')
+        return false
+      }
+
+      if (this.tableData.length === 0) {
+        this.$message.error('娌℃湁鐗╂枡鏄庣粏璁板綍')
+        return false
+      }
+
+      for (let i = 0; i < this.tableData.length; i++) {
+        const row = this.tableData[i]
+        if (!row.HMaterID) {
+          this.$message.error(`鏄庣粏璁板綍绗�${i + 1}琛�,鐗╂枡淇℃伅涓虹┖!`)
+          return false
+        }
+        if (!row.HUnitID) {
+          this.$message.error(`鏄庣粏璁板綍绗�${i + 1}琛�,鍗曚綅淇℃伅涓虹┖!`)
+          return false
+        }
+        if (!row.HQty || parseFloat(row.HQty) <= 0) {
+          this.$message.error(`鏄庣粏璁板綍绗�${i + 1}琛�,鐢熶骇鏁伴噺涓嶈兘涓虹┖鎴�0鎴栬�呭皬浜�0!`)
+          return false
+        }
+      }
+
+      return true
+    },
+
+    // 瀹℃牳
+    async handleCheckBill() {
+      try {
+        const response = await axios.get('/api/Sc_ICMOReportBill/AuditProcessReportList', {
+          params: {
+            HInterID: this.form.HInterID,
+            IsAudit: 0,
+            CurUserName: sessionStorage.HUserName
+          }
+        })
+
+        if (response.data.count === 1) {
+          this.$message.success(response.data.Message)
+        } else {
+          this.$message.error(response.data.Message)
+        }
+      } catch (error) {
+        this.$message.error('瀹℃牳澶辫触')
+      }
+    },
+
+    handleAdd() {
+      this.$router.push({
+        name: 'ProductionReport',
+        query: { OperationType: 1 }
+      })
+    },
+
+    handleCopyBill() {
+      // 澶嶅埗閫昏緫
+    },
+
+    handleAbandonCheck() {
+      // 鍙嶅鏍搁�昏緫
+    },
+
+    handleDeleteBill() {
+      // 鍒犻櫎閫昏緫
+    },
+
+    handlePrint() {
+      // 鎵撳嵃閫昏緫
+    },
+
+    handleExit() {
+      this.$router.back()
+    },
+
+    formatDate(date) {
+      if (!date) return ''
+      const d = new Date(date)
+      const month = '' + (d.getMonth() + 1)
+      const day = '' + d.getDate()
+      const year = d.getFullYear()
+
+      return [year, month.padStart(2, '0'), day.padStart(2, '0')].join('-')
+    },
+
+    isAllEqual(array) {
+      if (array.length > 0) {
+        return !array.some((value, index) => value !== array[0])
+      }
+      return true
+    },
+
+  
+    handleRemove(file, fileList) {
+      console.log(file, fileList)
+    },
+
+    handlePreview(file) {
+      console.log(file)
+    },
+
+    handleExceed(files, fileList) {
+      this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶)
+    },
+
+    beforeRemove(file, fileList) {
+      return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.operation-buttons {
+  margin-bottom: 20px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+}
+
+.page-title {
+  text-align: center;
+  margin: 20px 0;
+}
+
+.page-title h1 {
+  font-size: 24px;
+  font-weight: bold;
+}
+
+.table-toolbar {
+  margin-bottom: 10px;
+}
+
+.el-form-item {
+  margin-bottom: 18px;
+}
+
+.el-table {
+  margin-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue b/src/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue
new file mode 100644
index 0000000..e38ad1f
--- /dev/null
+++ b/src/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue
@@ -0,0 +1,1649 @@
+<template>
+  <div style="padding: 10px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="78px"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
+          <el-date-picker
+            v-model="sTime"
+            type="date"
+            placeholder="寮�濮嬫棩鏈�"
+            style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="缁撴潫鏃ユ湡">
+          <el-date-picker
+            v-model="eTime"
+            type="date"
+            placeholder="缁撴潫鏃ユ湡"
+            style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏃ユ湡闂撮殧">
+          <el-select
+            v-model="queryParams.HInitTimeCycle"
+            placeholder="璇烽�夋嫨"
+            @change="riqiChange"
+          >
+            <el-option
+              v-for="(item, index) in rqsgList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+          <el-input
+            v-model="queryParams.HBillNo"
+            placeholder="璇疯緭鍏ュ崟鎹彿"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
+          <el-card class="box-card">
+            <el-form :inline="true">
+              <el-form-item label="涓氬姟鍛�">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item label="鐗╂枡浠g爜">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item label="鐗╂枡鍚嶇О">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item label="渚涘簲鍟�">
+                <el-input></el-input>
+              </el-form-item>
+            </el-form>
+            <div slot="header" class="clearfix"><span>杩囨护</span></div>
+            <div>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-col :span="7">
+                    <el-select
+                      v-model="queryParams.ColName1"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <span v-for="(item, index) in btList" :key="index">
+                        <el-option
+                          :label="item.field"
+                          :value="item.field"
+                          v-if="!item.hide"
+                        ></el-option>
+                      </span>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6" style="padding: 0 10px">
+                    <el-select
+                      v-model="queryParams.Comparator1"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <el-option
+                        v-for="(item, index) in comparatorList"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value"
+                      ></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input
+                      v-model="queryParams.ColContent1"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
+                  </el-col>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-col :span="7">
+                    <el-select
+                      v-model="queryParams.ColName2"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <span v-for="(item, index) in btList" :key="index">
+                        <el-option
+                          :label="item.field"
+                          :value="item.field"
+                          v-if="!item.hide"
+                        ></el-option>
+                      </span>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6" style="padding: 0 10px">
+                    <el-select
+                      v-model="queryParams.Comparator2"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <span v-for="(item, index) in btList" :key="index">
+                        <el-option
+                          :label="item.field"
+                          :value="item.field"
+                          v-if="!item.hide"
+                        ></el-option>
+                      </span>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input
+                      v-model="queryParams.ColContent2"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
+                  </el-col>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-col :span="7">
+                    <el-select
+                      v-model="queryParams.ColName"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <el-option
+                        v-for="(item, index) in btList"
+                        :key="index"
+                        :label="item.field"
+                        :value="item.field"
+                      ></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6" style="padding: 0 10px">
+                    <el-select
+                      v-model="queryParams.Comparator"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <el-option
+                        v-for="(item, index) in comparatorList"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value"
+                      ></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input
+                      v-model="queryParams.ColContent"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
+                  </el-col>
+                </el-form-item>
+              </el-row>
+            </div> </el-card
+        ></el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleImport"
+          >瀵煎叆</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAddEdit((OperationType = 1))"
+          id="btn-Add"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleEdit((row = rowForm), (OperationType = 3), (copyType = -1))"
+          >缂栬緫</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleEdit((row = rowForm), (OperationType = 2), (copyType = 1))"
+          >澶嶅埗</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="single"
+          @click="handleDelete"
+          >鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_CheckBill(0, (form = rowForm))"
+          >瀹℃牳</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_CheckBill(1, (form = rowForm))"
+          >鍙嶅鏍�</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_De_Stop(0, (form = rowForm))"
+          >绂佺敤</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_De_Stop(1, (form = rowForm))"
+          >鍙嶇鐢�</el-button
+        >
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_CloseBill(1, (form = rowForm))"
+          >鍏抽棴</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_CloseBill(2, (form = rowForm))"
+          >鍙嶅叧闂�</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_CloseRow(0, (form = rowForm))"
+          >琛屽叧闂�</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_CloseRow(1, (form = rowForm))"
+          >琛屽弽鍏抽棴</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleRowHide"
+          >闅愯棌鍒楄缃�</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
+          >鎼� 绱�</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="" icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >閲� 缃�</el-button
+        >
+      </el-col>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+    </el-row>
+    <div class="tableBox" v-loading="loading">
+      <el-table
+        :data="tableData"
+        ref="tableData"
+        max-height="750"
+        :summary-method="getSummaries"
+        @selection-change="handleSelectionChange"
+        show-summary
+        border
+        @row-click="handleRowClick"
+        :row-style="rowStyle"
+        @cell-dblclick="handleDblclick"
+        v-if="tableShow"
+      >
+        <template v-for="(item, index) in btList">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center"
+            :fixed="item.fixed"
+            v-if="item.type == 'checkbox'"
+            :key="index"
+          />
+          <el-table-column
+            :align="item.align"
+            :prop="item.field"
+            :label="item.title"
+            :width="item.width"
+            :key="item.sorderid"
+            v-else-if="!item.hide && item.type != 'checkbox'"
+            :sortable="item.sort"
+            show-overflow-tooltip
+            :fixed="item.fixed"
+          >
+            <template slot-scope="{ row, column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{
+                  parseTime(row[column.property], "{y}-{m}-{d}")
+                }}</span>
+                <el-button
+                  type="text"
+                  @click="handleEdit(row, (OperationType = 3), (copyType = 1))"
+                  v-else-if="column.property == '鍗曟嵁鍙�'"
+                  >{{ row.鍗曟嵁鍙� }}</el-button
+                >
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="page"
+        :limit.sync="pageSize"
+        :pageSizes="pageSizes"
+        @pagination="getList"
+      />
+      <el-dialog
+        title="闅愯棌鍒楄缃�"
+        :visible.sync="openRowHide"
+        width="816px"
+        append-to-body
+      >
+        <RowSettings
+          :colName="btResList"
+          :HModName="HModName"
+          @rowEditClose="rowSetClose"
+          v-if="rowHideShow"
+        />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      
+         <!-- 缂栬緫寮圭獥 -->
+      <el-dialog
+        :title="editDialogTitle"
+        :visible.sync="openEdit"
+        width="90%"
+        append-to-body
+        class="production-report-dialog"
+        :before-close="handleEditClose"
+        fullscreen
+      >
+          <ProductionReportEdit
+            v-if="openEdit"
+            :propOperationType="currentOperationType"
+            :propLinterid="currentLinterid"
+            :propHSouceBillType="currentHSouceBillType"
+            :propCopyType="currentCopyType"
+            @editClose="handleEditClose"
+            @saveSuccess="handleSaveSuccess"
+          />
+      </el-dialog>
+      <el-dialog
+        :title="upload.title"
+        :visible.sync="upload.open"
+        width="1500px"
+        append-to-body
+      >
+        <div style="margin-top: -20px">
+          <el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
+          <el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
+          <el-upload
+            ref="upload"
+            :limit="1"
+            accept=".xlsx, .xls"
+            style="display: inline-block; margin-left: 10px"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+          >
+            <el-button type="primary">鏂囦欢涓婁紶</el-button>
+          </el-upload>
+        </div>
+        <el-table
+          :data="uploadData"
+          v-loading="uploadTableLoading"
+          :row-class-name="uploadDataIndex"
+          border
+          height="550"
+        >
+          <el-table-column type="index" label="搴忓彿" width="55" align="center" />
+          <el-table-column label="缁勭粐浠g爜" prop="缁勭粐浠g爜" align="center" width="120" />
+          <el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
+          <el-table-column
+            label="鐢熶骇璧勬簮鍚嶇О"
+            prop="鐢熶骇璧勬簮鍚嶇О"
+            align="center"
+            width="120"
+          />
+          <el-table-column
+            label="鐢熶骇璧勬簮浠g爜"
+            prop="鐢熶骇璧勬簮浠g爜"
+            align="center"
+            width="120"
+          />
+          <el-table-column label="閮ㄩ棬浠g爜" prop="閮ㄩ棬浠g爜" align="center" width="120" />
+          <el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
+          <el-table-column
+            label="璐熻矗浜轰唬鐮�"
+            prop="璐熻矗浜轰唬鐮�"
+            align="center"
+            width="120"
+          />
+          <el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
+          <el-table-column
+            label="宸ヤ綔涓績浠g爜"
+            prop="宸ヤ綔涓績浠g爜"
+            align="center"
+            width="120"
+          />
+          <el-table-column
+            label="宸ヤ綔涓績鍚嶇О"
+            prop="宸ヤ綔涓績鍚嶇О"
+            align="center"
+            width="120"
+          />
+          <el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
+          <el-table-column label="鎿嶄綔" align="center">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="uploadDataDelete(scope.row)"
+                >鍒犻櫎</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="uploadTotal > 0"
+          :total="uploadTotal"
+          :page.sync="uploadPage"
+          :limit.sync="uploadPageSize"
+          :pageSizes="uploadPageSizes"
+          @pagination="currentPage"
+        />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import gySource from "@/views/basic/gySource";
+import dayjs from "dayjs";
+import ProductionReportEdit from "./ScICMOReportBillEdit"; 
+
+export default {
+  name: "ProductionReportList",
+  components: { RowSettings, gySource,ProductionReportEdit  },
+  props: {
+    openPage: { type: String },
+  },
+  data() {
+    return {
+       // 缂栬緫寮圭獥鐩稿叧鏁版嵁
+      openEdit: false,
+      editDialogTitle: "鐢熶骇姹囨姤鍗�",
+      currentOperationType: 1,
+      currentLinterid: 0,
+      currentHSouceBillType: "",
+      currentCopyType: -1,
+
+
+
+      iframeUrl: "",
+      activeSeach: "",
+      dateRange: [],
+      HModName: "cgPoInStockBill",
+      editShow: false,
+      
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
+      HBillType: "1103",
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: "=", value: "=" },
+        { label: ">=", value: ">=" },
+        { label: ">", value: ">" },
+        { label: "<=", value: "<=" },
+        { label: "<", value: "<" },
+        { label: "<>", value: "<>" },
+        { label: "鍖呭惈", value: "7" },
+        { label: "宸﹀寘鍚�", value: "8" },
+        { label: "鍙冲寘鍚�", value: "9" },
+        { label: "涓嶅寘鍚�", value: "10" },
+      ],
+      sWhere: "",
+      sTime: "",
+      eTime: "",
+      rqsgList: [
+        { label: "浠婂ぉ", value: 0 },
+        { label: "杩戜袱澶�", value: 1 },
+        { label: "杩戜笁澶�", value: 2 },
+        { label: "杩戝洓澶�", value: 3 },
+        { label: "杩戜簲澶�", value: 4 },
+        { label: "杩戝叚澶�", value: 5 },
+        { label: "杩戜竷澶�", value: 6 },
+        { label: "杩�30澶�", value: 29 },
+        { label: "杩戝崐骞�", value: 180 },
+        { label: "杩戜竴骞�", value: 365 },
+        { label: "浠绘剰闂撮殧", value: -1 },
+      ],
+      hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
+      dialogTitle: "",
+      zuzhiId: "",
+      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
+      currentRow: [],
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      checkedSysZb: [],
+      editData: [], //鐢熶骇璧勬枡瀛愯〃
+      editBtData: [], //瀛愯〃琛ㄥご
+      activeName: "first",
+      searchOpen: false,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HOrgID: null,
+        HName: null,
+        HNumber: null,
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
+        HInitTimeCycle: 29,
+        HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
+        HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+      },
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      // 绂佺敤鏃ユ湡閫夋嫨
+      disableDataPicker: true,
+      tyResList: [], //鏀舵枡閫氱煡鍗曞垪琛紙鎺ュ彛鏁版嵁锛�
+      btList: [], //鏀舵枡閫氱煡鍗曞垪琛ㄦ樉绀�
+      btResList: [],
+      tableData: [], //鏀舵枡閫氱煡鍗曞垪琛�(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: [
+        "HItemID",
+        "hmainid",
+        "Hprocid",
+        "HUSEORGID",
+        "HCREATEORGID",
+        "HParentID",
+      ], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 50,
+      total: 0,
+      scollHeight: document.body.clientHeight * (38.056 / 100),
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
+        HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+        HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+      },
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞�
+        open: false,
+        // 寮瑰嚭灞傛爣棰�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        // headers: { Authorization: "Bearer " + getToken() },
+        // 涓婁紶鐨勫湴鍧�
+        url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
+      },
+      uploadData: [],
+      alluploadList: [],
+      uploadTableLoading: false,
+      uploadPageSizes: [50, 100, 500, 5000, 50000],
+      uploadPage: 1,
+      uploadPageSize: 50,
+      uploadTotal: 0,
+    };
+  },
+  mounted() {
+    this.queryParams.HOrgID = sessionStorage["Organization"];
+    window.editGyClose = () => {
+      this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+    };
+  },
+  created() {
+    this.riqiChange();
+    // this.getList();
+    this.handleQuery();
+  },
+  beforeDestroy() {
+    // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+    delete window.editGyClose;
+  },
+  methods: {
+    onDateScanOptionChangerHandler(e) {
+      this.queryParams.timeSpan = e;
+      if (e == -1) {
+        this.disableDataPicker = true;
+        return;
+      }
+
+      this.disableDataPicker = false;
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "鍚堣";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = "";
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      axios
+        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+        .then((res) => {
+          var data1 = res.data;
+          if (data1.count == 1) {
+            if (data1.data == "姘村姟") {
+              result = true;
+            }
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+      return result;
+    },
+    handleSellOpen() {
+      this.$router.push("/sellBill");
+    },
+    handleSellOutOpen() {
+      this.$router.push("/sellOutBill");
+    },
+    handleBtnHide() {
+      this.btnHideShow = true;
+      this.openBtnHide = true;
+    },
+    handleRowHide() {
+      this.rowHideShow = true;
+      this.openRowHide = true;
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false;
+      this.tableShow = true;
+      this.openRowHide = val;
+      this.getList();
+    },
+    riqiChange() {
+      if (this.queryParams.HInitTimeCycle == -1) {
+        return;
+      }
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, "0");
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, "0");
+      this.sTime = yyyyS + "-" + mmS + "-" + ddS;
+      this.eTime = yyyyE + "-" + mmE + "-" + ddE;
+    },
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+      if (num == 1) {
+        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+        this.form.HDeptID = deptRow.HItemID;
+        this.form.HEmpID = deptRow.HEmpID;
+        this.form.HManagerName = deptRow.璐熻矗浜�;
+        this.openData = false;
+      } else if (num == 2) {
+        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+        this.openData = false;
+      } else if (num == 3) {
+        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+        this.editData[this.zbIndex].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
+        this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+        this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+        this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+        this.editData[this.zbIndex].璁¢噺鍗曚綅 = deptRow.璁¢噺鍗曚綅鍚嶇О;
+        this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+        this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+        this.openData = false;
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum);
+      this.deptform = {};
+    },
+    async getList() {
+      this.tableShow = false;
+      this.loading = true;
+      if (this.pageSize == 0) {
+        this.pageSize = 50;
+      }
+
+      if (this.sTime && this.eTime) {
+        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+      }
+      try {
+        let res = await axios.get(this.baseURL + "Sc_ICMOReportBill/list", {
+          params: {
+            sWhere: this.sWhere,
+            user: sessionStorage["HUserName"],
+           
+          },
+        });
+        this.tyResList = [...JSON.parse(JSON.stringify(res.data.data))]; //鎬绘暟鎹�
+        let data1 = res.data;
+        let option = [];
+        if (data1.code == 1) {
+          this.btResList = data1.list; //鐢熶骇璧勬枡鎺ュ彛琛ㄥご鏁版嵁
+          this.total = data1.count;
+          var data = []; //鍒楀瓧娈垫暟鎹�
+          var col = [];
+          var totalArray = [];
+          //缁欑┖鐨勬暟缁勮祴鍊�
+          for (var key in data1.list) {
+            //寰簭閬嶅巻鏁扮粍
+            data.push({
+              id: data1.list[key].ColmCols,
+              name: data1.list[key].ColmCols,
+              Type: data1.list[key].ColmType,
+            }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
+          for (var i = 0; i < data.length; i++) {
+            //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+            if (this.titleData.indexOf(data[i].name) > -1) {
+              //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+              col.push({
+                field: data[i].id,
+                title: data[i].name,
+                align: "center",
+                hide: true,
+              }); //闅愯棌id鍒�
+            } else if (
+              totalArray.indexOf(data[i].name) > -1 ||
+              data[i].Type == "Decimal" ||
+              data[i].Type == "Int32"
+            ) {
+              //璁$畻鍒�
+              col.push({
+                field: data[i].id,
+                title: data[i].name,
+                align: "center",
+                sort: true,
+                totalRow: true,
+                width: 120,
+              });
+            } else {
+              col.push({
+                field: data[i].id,
+                title: data[i].name,
+                align: "center",
+                sort: true,
+                width: 200,
+              });
+            }
+          }
+          option.cols = [col];
+          this.dataList = option;
+          option.data = data1.data;
+          var result = data1.data;
+          var temp = "";
+          for (var i = 0; i < result.length; i++) {
+            if (temp != result[i]["hmainid"]) {
+              temp = result[i]["hmainid"];
+            } else {
+              result[i].鏃ユ湡 = null;
+              result[i].鍗曟嵁鍙� = "";
+              /*result[i].鐘舵�� = "";*/
+              result[i].绾㈣摑鍗曟爣璁� = "";
+              result[i].hsupid = "";
+              result[i].瀹㈡埛 = "";
+              result[i].HEmpID = "";
+              result[i].涓氬姟鍛� = "";
+              result[i].hmanagerid = "";
+              result[i].涓荤 = "";
+              result[i].hsecmanagerid = "";
+              result[i].鍙戣揣浜� = "";
+              result[i].hkeeperid = "";
+              result[i].淇濈鍛� = "";
+              result[i].HDeptID = "";
+              result[i].閮ㄩ棬 = "";
+              result[i].閿�鍞柟寮� = "";
+            }
+          }
+          option.data = result;
+          this.DisPlay_HideColumn(
+            this.HModName,
+            sessionStorage["HUserName"],
+            option,
+            this.dataList
+          );
+        }
+      } catch (err) {
+        this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
+      }
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = [];
+      axios
+        .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+          params: {
+            HModName: HModName,
+            user: user,
+          },
+        })
+        .then((res) => {
+          let data1 = res.data;
+          if (data1.data.length != 0) {
+            var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+            var newCols = [[]]; //瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+            newCols[0].push(option.cols[0][0]); //鏀惧叆绗竴涓猚heckbox
+            dataCol = data1.data[0].HGridString.split(",");
+            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+            if (dataCol.length == option.cols[0].length - 1) {
+              //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+              for (var j = 0; j < option.cols[0].length - 1; j++) {
+                for (var i = 0; i < option.cols[0].length - 1; i++) {
+                  var dataCols = dataCol[j].split("|");
+                  //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                  if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                    //闅愯棌鍒�
+                    if (dataCols[1] == 1) {
+                      option.cols[0][i + 1]["hide"] = true;
+                    }
+                    //璁剧疆鍒楀
+                    if (dataCols[3] > 0) {
+                      option.cols[0][i + 1]["width"] = dataCols[3];
+                    }
+                    //璁剧疆鍐呭瀛椾綋澶у皬
+                    if (data1.data[0].HFontSize != 0) {
+                      option.cols[0][i + 1]["style"] =
+                        "font-size:" + data1.data[0].HFontSize + "px;";
+                    } else {
+                      option.cols[0][i + 1]["style"] = "font-size:100%";
+                    }
+                    //鏄剧ず鍒�
+                    if (
+                      dataCols[1] == 0 &&
+                      this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1
+                    ) {
+                      option.cols[0][i + 1]["hide"] = false;
+                    }
+                    //缁熻鍒�
+                    if (dataCols[6] == 1) {
+                      option.cols[0][i + 1]["totalRow"] = true;
+                    } else {
+                      option.cols[0][i + 1]["totalRow"] = false;
+                    }
+                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                    switch (dataCols[2]) {
+                      case "L":
+                        option.cols[0][i + 1]["align"] = "left";
+                        break;
+                      case "M":
+                        option.cols[0][i + 1]["align"] = "center";
+                        break;
+                      case "R":
+                        option.cols[0][i + 1]["align"] = "right";
+                        break;
+                    }
+                    //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                    if (dataCols[4] != null && dataCols[4] != "") {
+                      option.cols[0][i + 1]["title"] = dataCols[4];
+                    }
+                    newCols[0].push(option.cols[0][i + 1]);
+                    break;
+                  }
+                }
+              }
+              //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+              if (dataCol.length == newCols[0].length - 1) {
+                option.cols = newCols;
+                //鍙栨秷鍐荤粨鍒�
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                  if (option.cols[0][i + 1]["fixed"] != null) {
+                    option.cols[0][i + 1]["fixed"] = null;
+                  } else {
+                    break;
+                  }
+                }
+                //鍐荤粨鍒�
+                if (data1.data[0].HFixCols != 0) {
+                  for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                    if (
+                      dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1
+                    ) {
+                      data1.data[0].HFixCols += 1;
+                    }
+
+                    option.cols[0][i + 1]["fixed"] = "left";
+                  }
+                }
+                //璁剧疆鍒楁帓搴�
+                for (var i = 1; i < option.cols[0].length; i++) {
+                  if (data1.data[0].HSortFlag == "鏄�") {
+                    option.cols[0][i]["sort"] = true;
+                  } else {
+                    option.cols[0][i]["sort"] = false;
+                  }
+                }
+              }
+            }
+            this.btList = option.cols[0];
+            this.btList.map((item) => {
+              if (!item.hide) {
+                this.totalNameList.push(item);
+              }
+            });
+            if (data1.data[0].HPageSize == 0) {
+              this.pageSize = 50;
+            } else {
+              this.pageSize = data1.data[0].HPageSize;
+            }
+            this.tableData = option.data;
+            this.tableShow = true;
+            this.loading = false;
+          } else {
+            this.btList = dataOption.cols[0];
+            this.btList.map((item) => {
+              if (!item.hide) {
+                this.totalNameList.push(item);
+              }
+            });
+            this.tableData = dataOption.data;
+            this.tableShow = true;
+            this.loading = false;
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    renderHeader(h, { column, $index }) {
+      // 鏂板缓涓�涓� span
+      let span = document.createElement(span); // 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label;
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span); // 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span);
+      return h(span, column.label);
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.hmainid)) {
+        return { background: "#ecf5ff" };
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.currentOperationType = 3;
+      this.handleEdit(row, 3, -1);
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map((item) => item.hmainid);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+      if (!this.single) {
+        this.rowForm = selection[0];
+      }
+    },
+    //鎵撳紑渚ц竟鎼滅储寮圭獥
+    handleSearch() {
+      this.searchOpen = true;
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = "";
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com =
+              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 =
+              "" +
+              this.queryParams.Comparator1 +
+              "'" +
+              this.queryParams.ColContent1 +
+              "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 =
+              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HBillNo) {
+        this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+      }
+
+      // if (this.queryParams.HOrgID) {
+      //   this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+      // }
+
+      this.sWhere += this.addSWhereByOpenType();
+      // this.sWhere += this.getOrgIDByUser();
+      this.searchOpen = false;
+      this.getList();
+    },
+    // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+    addSWhereByOpenType() {
+      //鑾峰彇鍙傛暟
+      var sWhere = "";
+      //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
+      if (this.openPage) {
+        sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''";
+        return sWhere;
+      }
+      return sWhere;
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+    getOrgIDByUser() {
+      var res = "";
+      axios
+        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+          params: {
+            HModName: this.HModName,
+            user: sessionStorage["HUserName"],
+            HOrgID: this.zuzhiId,
+          },
+        })
+        .then((res) => {
+          let result = res.data;
+          if (result.count == 1) {
+            if (result.data[0].sWhere == "1") {
+              res = " and HUSEORGID = '" + this.zuzhiId + "'";
+            } else {
+              res = result.data[0].sWhere;
+            }
+          }
+        })
+        .catch((error) => {
+          res = " and 1 = 0";
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+      return res;
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.sWhere = "";
+      Object.assign(this.Parameters, {
+        HBillNo: "",
+        HInitTimeCycle: 29,
+        HProjectNumber: "",
+        HCusID: null,
+        HMaterNumber: "",
+        HMaterName: "",
+        ColName1: "",
+        ColName2: "",
+        ColName: "",
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
+      });
+      this.riqiChange();
+      this.resetForm("queryForm");
+      this.getList();
+    },
+
+    //閫�鍑�
+    close() {
+      this.tableShow = true;
+      this.openEdit = false;
+      this.getList();
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.currentOperationType = 1; // 鏃犳簮鍗曟柊澧�
+      this.currentLinterid = 0;
+      this.currentHSouceBillType = "";
+      this.currentCopyType = -1;
+      this.editDialogTitle = "鏂板鐢熶骇姹囨姤鍗�";
+      this.openEdit = true;
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit(row, currentOperationType, copyType) {
+      if (!row || !row.hmainid) {
+        this.$message.warning("璇烽�夋嫨瑕佹搷浣滅殑鏁版嵁");
+        return;
+      }
+      this.currentOperationType = currentOperationType;
+      this.currentLinterid = row.hmainid;
+      this.currentHSouceBillType = row.HSourceBillType || "";
+      this.currentCopyType = copyType;
+      
+      if (currentOperationType === 3) {
+        this.editDialogTitle = "缂栬緫鐢熶骇姹囨姤鍗�";
+      } else if (currentOperationType === 5) {
+        this.editDialogTitle = "澶嶅埗鐢熶骇姹囨姤鍗�";
+      } else if (currentOperationType === 2) {
+        this.editDialogTitle = "鏈夋簮鍗曟柊澧炵敓浜ф眹鎶ュ崟";
+      }
+      
+      this.openEdit = true;
+    },
+    // 鍏抽棴缂栬緫寮圭獥
+    handleEditClose() {
+      this.openEdit = false;
+      this.currentOperationType = 1;
+      this.currentLinterid = 0;
+      this.currentHSouceBillType = "";
+      this.currentCopyType = -1;
+    },
+     // 淇濆瓨鎴愬姛鍥炶皟
+    handleSaveSuccess() {
+      this.handleEditClose();
+      this.getList(); // 鍒锋柊鍒楄〃
+      this.$message.success("鎿嶄綔鎴愬姛");
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          if (!this.rowForm.瀹℃牳浜�) {
+            axios
+              .get(this.baseURL + "Sc_ICMOReportBill/DeltetICMOReportBill", {
+                params: {
+                  HInter: this.rowForm.hmainid.toString(),
+                  user: sessionStorage["HUserName"],
+                },
+              })
+              .then((res) => {
+                if (res.data.count == 1) {
+                  this.handleQuery();
+                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+                } else {
+                  this.$modal.msgError("閿欒:" + result.code + result.Message);
+                }
+              })
+              .catch((error) => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+          } else {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+          }
+        })
+        .catch(() => {});
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID || form.hmainid;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Sc_ICMOReportBill/AuditProcessReportList", {
+          params: {
+            HInterID: InterID,
+            IsAudit: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
+        })
+        .then((res) => {
+          let result = res.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.getList();
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    // 鍏抽棴/鍙嶅叧闂暟鎹�
+    async set_CloseBill(num, form) {
+      let HInterID = form.HItemID || form.HInterID || form.hmainid;
+      try {
+        let res = await axios.get(
+          `${this.baseURL}/Sc_ICMOReportBill/CloseSc_ICMOReportBill`,
+          {
+            params: {
+              HInterID: HInterID,
+              Type: num,
+              user: sessionStorage["HUserName"],
+            },
+          }
+        );
+
+        let { data, Message, count } = res.data;
+
+        if (count == 1) {
+          this.handleQuery();
+        } else {
+          this.$modal.msgError(`${Message}`);
+        }
+      } catch (err) {
+        this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
+      }
+    },
+    // 琛屽叧闂�/琛屽弽鍏抽棴鏁版嵁
+    async set_CloseRow(num, form) {
+      let HInterID = form.HItemID || form.HInterID || form.hmainid;
+      let HEntryID = form.HEntryID || form.hsubid;
+      try {
+        let res = await axios.get(
+          `${this.baseURL}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
+          {
+            params: {
+              HInterID: HInterID,
+              HEntryID: HEntryID,
+              ISAudit: num,
+              CurUserName: sessionStorage["HUserName"],
+            },
+          }
+        );
+
+        let { data, Message, count } = res.data;
+
+        if (count == 1) {
+          this.handleQuery();
+        } else {
+          this.$modal.msgError(`${Message}`);
+        }
+      } catch (err) {
+        this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
+      }
+    },
+    
+    // 鍙嶇鐢�/绂佺敤鏁版嵁
+    set_De_Stop(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
+        })
+        .then((res) => {
+          let result = res.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.getList();
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `gySource_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+    },
+    handleImport() {
+      this.uploadData = [];
+      this.upload.isUploading = false;
+      this.upload.title = "瀵煎叆";
+      this.upload.open = true;
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.uploadTableLoading = true;
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(res, file, fileList) {
+      // this.upload.open = false;
+      this.upload.isUploading = true;
+      this.$refs.upload.clearFiles();
+      if (res.code == 1) {
+        this.alluploadList = res.data;
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+        this.uploadTotal = this.alluploadList.length;
+        this.uploadTableLoading = false;
+        // this.set_AddNew(res.data)
+      } else {
+        this.$alert(
+          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+            res.Message +
+            "</div>",
+          "瀵煎叆缁撴灉",
+          { dangerouslyUseHTMLString: true }
+        );
+      }
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    set_AddNew() {
+      var num = [];
+      for (var i = 0; i < this.uploadData.length; i++) {
+        if (this.uploadData[i] != "") {
+          num.push(this.uploadData[i]);
+        }
+      }
+      var sSubStr = JSON.stringify(num);
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
+      axios({
+        method: "post",
+        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+        data: {
+          sMainSub: sMainSub,
+        },
+      })
+        .then((res) => {
+          this.$alert(
+            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+              res.data.Message +
+              "</div>",
+            "瀵煎叆缁撴灉",
+            { dangerouslyUseHTMLString: true }
+          );
+          this.upload.open = false;
+          this.getList();
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    uploadDataIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    uploadDataDelete(row) {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          const deleteList = [row.index];
+          const data = this.uploadData;
+          this.uploadData = data.filter((item) => {
+            return deleteList.indexOf(item.index) == -1;
+          });
+        })
+        .catch(() => {});
+    },
+    getPage(page, list) {
+      let sindex = (parseInt(page) - 1) * this.uploadPageSize;
+      let eindex = parseInt(page) * this.uploadPageSize;
+      let newList = list.slice(sindex, eindex);
+      console.log(newList);
+      return newList;
+    },
+    currentPage(val) {
+      this.uploadPage = val.page;
+      setTimeout(() => {
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+      }, 100);
+    },
+  },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+
+.form-item-inline > .el-form-item__content {
+  display: flex;
+  flex-direction: row;
+  width: 60%;
+}
+</style>
diff --git a/src/views/gyMaterial/GyMaterial.vue b/src/views/gyMaterial/GyMaterial.vue
index 6aab067..ab8dfad 100644
--- a/src/views/gyMaterial/GyMaterial.vue
+++ b/src/views/gyMaterial/GyMaterial.vue
@@ -201,9 +201,9 @@
           </el-collapse-item>
         </el-collapse>
       </el-form>
-      <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393;margin: 20px 0;">
+      <!-- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393;margin: 20px 0;">
         {{ currentFilterScheme }}
-      </div>
+      </div> -->
     </el-card>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -717,7 +717,7 @@
           this.getTreeData();
           this.getProjectOptions();
           this.getList();
-          this.getDefaultFilterScheme();
+          //this.getDefaultFilterScheme();
         })
         .catch((error) => {
           this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");

--
Gitblit v1.9.1