From 4dd64523aef3b34caa94b6a1e97816f5155abceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 13 May 2024 17:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AFpc=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AFPC=E3=80=91=E2=80=9C=E6=B3=A8=E5=A1=91?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E2=80=9C=E5=96=B7=E6=B6=82=E2=80=9D=EF=BC=8C?=
 =?UTF-8?q?=E2=80=9C=E8=A3=85=E9=85=8D=E2=80=9D=EF=BC=8C=EF=BC=88=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7+=E4=BB=BB=E5=8A=A1+=E8=AE=B0=E5=BD=95=EF=BC=899?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialIssueManage/PT/IssueJobPT.vue     | 547 ++----------------
 .../materialIssueManage/PT/IssueNotePT.vue    |  85 +--
 .../materialIssueManage/PT/IssueRequestPT.vue | 182 ++----
 .../materialIssueManage/ZP/IssueJobZP.vue     | 547 ++----------------
 .../materialIssueManage/ZP/IssueNoteZP.vue    |  85 +--
 .../materialIssueManage/ZP/IssueRequestZP.vue | 182 ++----
 .../materialIssueManage/ZS/IssueJobZS.vue     |  85 +--
 .../materialIssueManage/ZS/IssueNoteZS.vue    |  43 +-
 .../materialIssueManage/ZS/IssueRequestZS.vue | 100 ++--
 9 files changed, 302 insertions(+), 1554 deletions(-)

diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue b/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue
index 437342642..8f70b0fe7 100644
--- a/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue
+++ b/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue
@@ -24,20 +24,19 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 执行 -->
-    <handelFrom
-      :formTitle="formTitle"
-      :displayDialog.sync="displayDialog.handleFromDialog"
-      :CreateFormData="handleFormData"
-      :CreateForm="handleForm"
-      :Rules="editRules.handleRule"
-      :Options="editOptions"
-      :detailsTableColumns="handleDetailsTableColumns"
-      :isShowIndex="true"
-      :selectionTable="true"
-      @handleSelectionChange="handleSelectionChange"
-      @FormSubmit="handleFormSubmit"
-    ></handelFrom>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
@@ -47,51 +46,23 @@
       :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
       @close-value="closeValue"
-      :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
       :totalCount="totalCountDetails"
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      >
-      <template>
-        <el-table-column
-          fixed="right"
-          label="操作"
-          align="center"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <el-button 
-              type="primary"
-              @click="showLibraryShift(scope)"
-              size="small"
-            >查看库移</el-button>
-          </template>
-        </el-table-column>
-      </template>		
-    </curren-Drawer>
-    <!-- 查看库移弹窗 -->
-    <libraryShiftSearch
-      :rowData="libraryShiftRow"
-      :isShow="libraryShiftShow"
-      v-on:setClose='closeLibraryShift'
-    ></libraryShiftSearch>
+    ></curren-Drawer>
   </div>
 </template>
 <script>
-import { getPageList, createAndHandle } from "@/api/wms-api"
-import { materialRequestByType, handle} from "@/api/wms-job"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import store  from '@/store'
-import { initPrintAllData } from "@/mixins/printMixin"
-import libraryShiftSearch from "@/views/materialIssueManage/libraryShiftSearch"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
+import { complete } from "@/api/wms-job";
 
 export default {
   name: "IssueJobPT",
@@ -101,485 +72,47 @@ export default {
     drawerMixins,
     TableHeaderMixins,
     mixins,
-    newAndEdiDialogMixins
   ],
-  components:{libraryShiftSearch},
   computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.jobStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
     },
-    // hideButton: function () {
-    //   return function (val) {
-    //     let data = true
-    //     val.forEach(key => {
-    //       if (this.propsData.jobStatus == key) {
-    //         data = false
-    //       }
-    //     })
-    //     return data
-    //   }
-    // },
   },
-  data () {
+  data() {
     return {
-      URL: 'wms/store/issue-job',
-      tableLoading: false,
-      handleMultipleSelection: [],
+      URL: "wms/store/issue-job",
       //常用按钮数据
       currenButtonData: [
-        // this.defaultExportBtn(),//导出
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
         {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
+          type: 'success',
+          label: '完成',
           hide: false,
-          name: "print",
+          name: "CompleteJob",
+          hide: () => { return this.hideButton([1,2,4]) },
           size: 'mini'
         },
       ],
-      handleDetailsTableColumns: [
-        { label: "物品代码", prop: "itemCode", },
-        { label: "物品名称",  prop: "itemName" },
-        { label: "实际库位", prop: "handledLocationCode", },
-        { label: "推荐库位", prop: "recommendLocationCode", },
-        { label: "实际箱标签", prop: "handledPackingCode", },
-        { label: "推荐箱标签", prop: "recommendPackingCode", },
-        { label: "实际批次", prop: "handledLot", },
-        { label: "推荐批次", prop: "recommendLot", },
-        { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty", },
-        { type: "object", label: "实际单位", prop: "handledQty", showProp: "uom", },
-        { type: "object", label: "推荐数量", prop: "recommendQty", showProp: "qty", },
-        { type: "object", label: "推荐单位", prop: "recommendQty", showProp: "uom", },
-      ],
-      editOptions: {
-
-      },
-      handleFormData: {
-        id: null,
-        creationTime: null,
-        IssueNoteNumber: "123",
-        lastModificationTime: null,
-        remark: null,
-        concurrencyStamp: null,
-        company: null,
-        number: null,
-        upStreamJobNumber: null,
-        materialRequestNumber: null,
-        jobType: 1,
-        jobStatus: 1,
-        priority: 0,
-        priorityIncrement: 0,
-        wlgCode: "123",
-        isAutoComplete: true,
-        details: [],
-        acceptTime: null,
-        completeTime: null,
-        prodLine: null,
-        toLocationCode: null,
-      },
-      childTableData: [
-        {
-          "id": null,
-          "creationTime": null,
-          //   "creatorId": null,
-          "lastModificationTime": null,
-          //   "lastModifierId": null,
-          "remark": null,
-          "concurrencyStamp": null,
-          "masterID": null,
-          "packingCode": null,
-          "containerCode": null,
-          "item": {
-            "id": null,
-            "name": null,
-            "desc1": null,
-            "desc2": null
-          },
-          "itemCode": null,
-          "stdPack": {
-            "packUom": null,
-            "packQty": 0
-          },
-          "recommendBatch": {
-            "supplierBatch": null,
-            "produceDate": null
-          },
-          "recommendLot": "",
-          "recommendLocationCode": "",
-          "recomendQty": {
-            "uom": null,
-            "qty": 0
-          },
-          "handledBatch": {
-            "supplierBatch": null,
-            "produceDate": null
-          },
-          "handledLot": "",
-          "handledLocationCode": "",
-          "handledQty": {
-            "uom": null,
-            "qty": 0
-          },
-          "fromLocation": "",
-          "toLocation": "",
-          "workshop": null,
-          "prodLine": null,
-          "workCenter": null,
-        }
-      ],
-      handleForm: [
-        { type: "input", label: "任务编号", prop: "number", colSpan: 12, disabled: "true" },
-        { type: "input", label: "到货编号", prop: "arriveNumber", colSpan: 12, disabled: "true" },
-        { type: "select", label: "任务类型", prop: "jobType", options: "taskType", colSpan: 12, disabled: "true" },
-        { type: "select", label: "任务状态", prop: "jobStatus", options: "jobStatus", colSpan: 12, disabled: "true" },
-        { type: "input", label: "优先级", prop: "priority", colSpan: 12, disabled: "true" },
-        { type: "input", label: "工作组", prop: "wlgCode", colSpan: 12, disabled: "true" },
-        { type: "dateTime", label: "接收时间", prop: "acceptTime", colSpan: 12, },
-        { type: "input", label: "备注", prop: "remark", colSpan: 12, },
-        { type: "input", label: "生产线", prop: "prodLine", disabled: "true", colSpan: 12,  },
-        // { type: "autocomplete", label: "目标库位", prop: "toLocationCode", optionsLabel: "itemCode", optionsValue: "locationCode", focus: (val) => { return this.getSelectList(val, "wms/inventory/Inventory-Balance") }, click: (val) => { this.filterTable(val, 'wms/inventory/Inventory-Balance', 'InventoryBalance-PullForm', '库位选择') }, colSpan: 12 },
-        { type: "autocomplete", label: "目标库位", prop: "toLocationCode", optionsLabel: "name", optionsValue: "code", focus: (val) => { return this.getSelectList(val, "basedata/Location") }, click: (val) => { this.filterTable(val, 'basedata/Location', 'InventoryBalance-PullForm', '库位选择') }, colSpan: 12 },
-      ],
-      editRules: {
-        handleRule: {
-          number: [
-            { required: true, trigger: "blur", message: "不可为空" },
-          ],
-          jobType: [{ required: true, trigger: "blur", message: "不可为空" }],
-          jobStatus: [{ required: true, trigger: "blur", message: "不可为空" }],
-          priority: [{ required: true, trigger: "blur", message: "不可为空" }],
-          wlgCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-        },
-        cerateRule: {
-          itemCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-          toLocationCode: [{ required: false, trigger: "blur", message: "不可为空" }],
-          numberInput: [{ required: true, trigger: "blur", message: "不可为空" }],
-        }
-      },
-      libraryShiftShow:false,//查看库移弹窗显示
-      libraryShiftRow:null,//查看库移当前行数据
     };
   },
-  mounted () {
+  mounted() {
     this.paging();
-  },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        requestType: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params)
-        .then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    handleFormSubmit (val) {
-      let that = this
-      return new Promise((resolve, reject) => {
-        if (that.handleMultipleSelection.length == 0) {
-          that.$errorMsg('请先择提交的数据！')
-          reject()
-        } else {
-          if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
-            that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              that.checkHandleSubmit(resolve, reject)
-            }).catch(() => {
-              reject()
-            })
-          } else {
-            that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              that.checkHandleSubmit(resolve, reject)
-            }).catch(() => {
-              reject()
-            })
-          }
-        }
-      })
-    },
-    checkHandleSubmit(resolve, reject) {
-      let that = this
-      
-      let items = that.handleMultipleSelection.filter(r => {
-        return (r.handledPackingCode === null || r.handledPackingCode === '')
-      })
-
-      if (items.length > 0) {
-        let packingCodes = '';
-        items.forEach(r => {
-          packingCodes += r.recommendPackingCode + ','
-        })
-        that.$confirm('以下箱码对应的实际箱码为空,是否要继续发料?:[' + packingCodes + ']', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          that.finshIssueJobHandle(resolve, reject)
-        }).catch(() => {
-          return reject()
-        })
-      } else {
-        that.finshIssueJobHandle(resolve, reject)
-      }
-    },
-    finshIssueJobHandle(resolve, reject) {
-      let that = this
-      let data = {
-        id: that.propsData.id
-      }
-      that.handleMultipleSelection.forEach(item => {
-        item.toLocationCode = that.handleFormData.toLocationCode
-        item.handledContainerCode = item.recommendContainerCode;
-				item.handledPackingCode = item.recommendPackingCode;
-				item.handledBatch = item.recommendBatch;
-				item.handledLot = item.recommendLot;
-				item.handledLocationCode = item.recommendLocationCode;
-      })
-      let params = JSON.parse(JSON.stringify(that.handleFormData))
-      delete params.details
-      params.details = that.handleMultipleSelection
-      handle(params, data, that.URL).then(res => {
-        that.displayDialog.handleFromDialog = false;
-        that.$successMsg('已生成发料记录！')
-        that.paging()
-        return resolve()
-      }).catch(err => {
-        return reject();
-      })
-    },
-    // 输入框 变更
-    changeInput(prop, val) {
-      let that = this
-      if (prop == 'numberInput' ) {
-        this.$confirm('是否要将以下所有零件的需求数量更改为[' + val + ']', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          that.CreateFormData.details.forEach(item => {
-            item.numberDetails = parseInt(val)
-          })
-        }).catch(() => {
-        })
-      }
-    },
-    //新增——删除table
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
-    //新增-按钮
-    FormClick(val) {
-      let that = this
-      if (val[0] == 0) {
-      } else if (val[0] == 1) {
-        // 查询
-        this.editRules.cerateRule.toLocationCode[0].required = false
-        val[1].validate((valid) => {
-          if (valid) {
-            this.tableLoading = true
-            let params = {
-              condition: {
-                filters: [
-                  {
-                      logic: "And",
-                      column: "code",
-                      action: "==",
-                      value: that.CreateFormData.itemCode
-                  }
-                ]
-              },
-              Sorting: "",
-              SkipCount: 0,
-              MaxResultCount: 100
-            }
-            getPageList(params, 'basedata/item-basic').then(res => {
-              if (res.items.length == 0) {
-                this.$errorMsg('未查询到该物品信息!')
-              } else {
-                let findRs = that.CreateFormData.details.find(item => (
-                  item.code == that.CreateFormData.itemCode
-                ))
-                if (!findRs) {
-                  res.items.forEach(item => {
-                    item.numberDetails = 0
-                    that.CreateFormData.details.push(item)
-                  })
-                }
-              }
-              this.tableLoading = false
-            }).catch(err => {
-              console.log(err)
-              this.tableLoading = false
-            })
-          } else {
-            this.$errorMsg('请检查表单')
-          }
-        })
-      } else {
-        this.editRules.cerateRule.toLocationCode[0].required = true
-        val[1].validate((valid) => {
-          if (valid) {
-            if (this.CreateFormData.details.length > 0) {
-              let params = {
-                worker: store.getters.name.userName,
-                company: localStorage.getItem("company"),
-                details: [],
-              }
-              for (var i = 0; i < this.CreateFormData.details.length; i++) {
-                if (this.CreateFormData.details[i].numberDetails <= 0) {
-                  this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
-                  return
-                } else {
-                  params.details.push({
-                    itemCode: this.CreateFormData.details[i].code,
-                    item: {
-                      id: this.CreateFormData.details[i].id,
-                      name: this.CreateFormData.details[i].name,
-                      desc1: this.CreateFormData.details[i].desc1,
-                      desc2: this.CreateFormData.details[i].desc2,
-                    },
-                    qty: {
-                      uom: this.CreateFormData.details[i].basicUom,
-                      qty: this.CreateFormData.details[i].numberDetails
-                    },
-                    prodLine: '',
-                    status: this.CreateFormData.details[i].status,
-                    toLocationCode: this.CreateFormData.toLocationCode,
-                    worker: store.getters.name.userName,
-                  })
-                }
-              }
-              this.Loading.newAndEdiLoading = true
-              createAndHandle(params).then( res => {
-                this.displayDialog.newDialog = false
-                this.Loading.newAndEdiLoading = false
-                this.$successMsg("发料任务创建成功！")
-                this.paging()
-              }).catch(err => {
-                console.log(err)
-                this.Loading.newAndEdiLoading = false
-              })
-            } else {
-              this.$errorMsg('无数据可提交！')
-            }
-          } else {
-            this.$errorMsg('请检查表单')
-          }
-        })
-      }
-    },
-    drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        _propsData.title = "线边仓领料单"
-        _propsData.details.forEach(item=>{
-          item.recommendLot = item.recommendLot + " "
-        })
-        let _option = {
-          details:{
-            fromLocationCode:"recommendFromLocationCode",
-            qty:"handledQty",
-            fromLot:"recommendLot",
-            fromLocationErpCode:"recommendFromLocationErpCode",
-          }
-        }
-        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);
-        this.Print(data)
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    },
-    // drawerbutton(val) {
-    //   if (val == 'handleJob') {
-    //     this.Loading.appMainLoading = true
-    //     let propsData = JSON.parse(JSON.stringify(this.propsData));
-    //     this.$listAssign(this.handleFormData, propsData)
-    //     this.handleFormData.toLocationCode = this.handleFormData.details[0].toLocationCode
-    //     this.handleMultipleSelection = []
-    //     this.Loading.appMainLoading = false
-    //     this.formTitle = "执行" + this.$route.meta.title;
-    //     this.displayDialog.handleFromDialog = true
-    //   } else {
-    //     drawerMixins.methods.drawerbutton(val, this)
-    //   }
-    // },
-    handleSelectionChange(val) {
-      this.handleMultipleSelection = val
-    },
-    showLibraryShift(scope){
-      if(!scope.row.tenantId){return this.$errorMsg("事务类型有误")}
-      this.libraryShiftShow = true
-      this.libraryShiftRow = scope
-    },
-    closeLibraryShift(data){
-      this.libraryShiftShow = data
-      this.libraryShiftRow = null
-    }
   }
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/mainbasicData.scss";
-::v-deep .newAndEdiDialog {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  .el-form {
-    flex: 1;
-    display: flex;
-    justify-content: flex-start;
-    align-content: flex-start;
-    flex-wrap: wrap;
-    overflow: hidden;
-    overflow-y: auto;
-  }
-  .screen-push {
-    color: rgb(64, 158, 255);
-    span {
-      cursor: pointer;
-      &:hover {
-        color: blue;
-      }
-    }
-  }
-  .formButton {
-    padding: 20px 20px 20px 0;
-  }
-  .formTable-box {
-      height: 70% !important;
-
-      .el-form-item__content {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-        margin: 0 !important;
-      }
-    }
-}
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue b/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue
index 0244c2d20..ff8cd3553 100644
--- a/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue
+++ b/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue
@@ -24,16 +24,27 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 抽屉 -->
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
       :propsData="propsData"
-      :Butttondata="DrawerButtonData"
       :tabsDesTions="tabsDesTions"
+      :Butttondata="[]"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
       @handleCommand="drawerHandle"
       @close-value="closeValue"
       :tableColumns="detailsTableColumns"
@@ -45,13 +56,11 @@
   </div>
 </template>
 <script>
-import { materialRequestByType } from "@/api/wms-api"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { initPrintAllData } from "@/mixins/printMixin"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
 export default {
   name: "IssueNotePT",
   mixins: [
@@ -61,69 +70,23 @@ export default {
     TableHeaderMixins,
     mixins,
   ],
-  data () {
+  data() {
     return {
-      URL: 'wms/store/issue-note',
+      URL: "wms/store/issue-note",
       //常用按钮数据
       currenButtonData: [
-        this.defaultExportBtn(),//导出
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
-      DrawerButtonData: [
-        {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
-          hide: false,
-          name: "print",
-          size: 'mini'
-        },
-      ]
     };
   },
-  mounted () {
+  mounted() {
     this.paging();
   },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        requestType: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        // _propsData.title = "送货单"
-        _propsData.title = "线边仓领料单"
-        _propsData.details.forEach(item=>{
-          item.fromLot = item.fromLot + " "
-        })
-        let _option = {
-          number:"requestNumber",
-        }
-        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);
-        this.Print(data)
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    }
-  },
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/basicData.scss";
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue b/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue
index e19006870..4e0f1386a 100644
--- a/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue
+++ b/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue
@@ -30,15 +30,13 @@
       :loading="Loading.importLoading"
       :show="displayDialog.importDialog"
       :URL="URL"
-      :disabledMethod="{ method1: false, method2: false, method3: false }"
-      :disabledIsAllowPartImport="{
-        isAllowPartImport1: false,
-        isAllowPartImport2: false,
-      }"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
       isAllowPartImportValue="1"
       @importClick="postImportMergeClick(arguments)"
       @postImportDown="importDown"
     ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
@@ -48,8 +46,8 @@
       :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
       @close-value="closeValue"
-      :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
       :totalCount="totalCountDetails"
       :MaxResultCount="MaxResultCountDetails"
@@ -59,14 +57,11 @@
   </div>
 </template>
 <script>
-import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { requestData } from "@/utils/processButtonData"
-import requestDataNames from "@/utils/processButtonData"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
 export default {
   name: "IssueRequestPT",
   mixins: [
@@ -77,150 +72,63 @@ export default {
     mixins,
   ],
   computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.requestStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
     },
   },
-  data () {
-    let _this = this;
+  data() {
     return {
-      URL: 'wms/store/material-request',
-      tableLoading: false,
-      handleMultipleSelection: [],
+      URL: "wms/store/material-request",
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+      //   this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
-      //执行前获取记录数据暂存
-      oldIssueJobIds: [],
       DrawerButtonData: [
-        // ...requestData(this),
         {
-          type: 'success',
-          label: '完成',
-          hide: () => { return this.completeRequestInit([2,6])},
-          name: "completeRequest",
+          type: 'warning',
+          label: '执行',
+          hide: false,
+          name: "handleGetIds",
+          hide: () => { return this.hideButton([1,5,9]) },
+          size: 'mini',
+          handleGetJobsUrl:'wms/store/material-job',
+          // handleRequestUrl:'wms/store/kitting-issue-request',
+        },
+        {
+          type: 'danger',
+          label: '取消',
+          hide: false,
+          name: "cancelRequest",
+          hide: () => { return this.hideButton([1,5,9]) },
           size: 'mini'
         },
         {
-          type: 'warning',
-          label: '执行',
-          name: "IssueRequest-zx",
-          hide: () => { return this.againHandleRequestInit([9])},
+          type: 'success',
+          label: '完成',
+          hide: false,
+          name: "completeRequest",
+          hide: () => { return this.hideButton([1,5,9]) },
           size: 'mini'
         },
-        ...requestData(this,false,false,[requestDataNames.againHandle]),
       ],
     };
   },
-  mounted () {
-    this.paging()
+  mounted() {
+    this.paging();
   },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        type: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    // 重新定义【完成按钮】显示判断 除了2(待审批) 和 6（完成状态）都显示（abortRequestRequestInit）
-    completeRequestInit(val){
-      let data = false
-      val.forEach(key => {
-        if (this.propsData.requestStatus == key) {
-          data = true
-        }
-      })
-      return data
-    },
-    // 定义【执行按钮】显示判断 ==9时候显示
-    againHandleRequestInit(val){
-      let data = true
-      val.forEach(key => {
-        if (this.propsData.requestStatus == key) {
-          data = false
-        }
-      })
-      return data
-    },
-    // 执行成功后处理
-    handleResult(){
-      getDetailed(this.propsData.id, this.URL).then(res => {
-        this.propsData = res
-      })
-      this.paging()
-      this.Loading.appMainLoading = false
-    },
-    //抽屉常用按钮
-    drawerbutton (val) {
-      // 执行
-      if(val == 'IssueRequest-zx'){
-        this.Loading.appMainLoading = true
-        // 获取记录数据暂存
-        processRequest(this.propsData.number,'wms/store/issue-job/by-request-number/').then(resFirst=>{
-          this.oldIssueJobIds = []
-          resFirst.forEach(item=>{
-            this.oldIssueJobIds.push(item.id)
-          })
-          // 执行操作
-          processRequest(this.propsData.id, this.URL + '/handle/').then(resHandle => {
-            // 重新获取记录对比
-            processRequest(this.propsData.number,'wms/store/issue-job/by-request-number/').then(resNew=>{
-              // 重新获取的记录为空（未生成任务）
-              if(!resNew || resNew.length <= 0){
-                this.$errorMsg('没有可用库存，未生成新任务')
-                this.handleResult()
-                return
-              }
-              // 当前有记录
-              if(resNew && resNew.length > 0){
-                let _newIds = []
-                resNew.forEach(item=>{
-                  _newIds.push(item.id)
-                })
-                if(this.oldIssueJobIds.sort().toString() === _newIds.sort().toString()){
-                  let mes = '未生成任务原因: ' + `<br/>` + '1、该请求中的【物品】的【实际发货数量】小于【请求数量】,请确认数量后点击【完成】。' + `<br/>` + '2、该请求中的【库存余额】小于【请求数量】,请确认数量后点击【执行】'
-                  this.$alert(mes,
-                    '错误提示', {
-                    confirmButtonText: '确定',
-                    dangerouslyUseHTMLString: true
-                  })
-                }else{
-                  this.$successMsg('执行成功，已生成新任务')
-                }
-                this.handleResult()
-              }
-            })
-          }).catch(err => {
-            console.log(err)
-            this.Loading.appMainLoading = false
-          })
-        }).catch(err => {
-          console.log(err)
-          this.Loading.appMainLoading = false
-        })
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    },
-  }
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/mainbasicData.scss";
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZP/IssueJobZP.vue b/fe/PC/src/views/materialIssueManage/ZP/IssueJobZP.vue
index ee456f616..722647373 100644
--- a/fe/PC/src/views/materialIssueManage/ZP/IssueJobZP.vue
+++ b/fe/PC/src/views/materialIssueManage/ZP/IssueJobZP.vue
@@ -24,20 +24,19 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 执行 -->
-    <handelFrom
-      :formTitle="formTitle"
-      :displayDialog.sync="displayDialog.handleFromDialog"
-      :CreateFormData="handleFormData"
-      :CreateForm="handleForm"
-      :Rules="editRules.handleRule"
-      :Options="editOptions"
-      :detailsTableColumns="handleDetailsTableColumns"
-      :isShowIndex="true"
-      :selectionTable="true"
-      @handleSelectionChange="handleSelectionChange"
-      @FormSubmit="handleFormSubmit"
-    ></handelFrom>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
@@ -47,51 +46,23 @@
       :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
       @close-value="closeValue"
-      :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
       :totalCount="totalCountDetails"
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      >
-      <template>
-        <el-table-column
-          fixed="right"
-          label="操作"
-          align="center"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <el-button 
-              type="primary"
-              @click="showLibraryShift(scope)"
-              size="small"
-            >查看库移</el-button>
-          </template>
-        </el-table-column>
-      </template>		
-    </curren-Drawer>
-    <!-- 查看库移弹窗 -->
-    <libraryShiftSearch
-      :rowData="libraryShiftRow"
-      :isShow="libraryShiftShow"
-      v-on:setClose='closeLibraryShift'
-    ></libraryShiftSearch>
+    ></curren-Drawer>
   </div>
 </template>
 <script>
-import { getPageList, createAndHandle } from "@/api/wms-api"
-import { materialRequestByType, handle} from "@/api/wms-job"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import store  from '@/store'
-import { initPrintAllData } from "@/mixins/printMixin"
-import libraryShiftSearch from "@/views/materialIssueManage/libraryShiftSearch"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
+import { complete } from "@/api/wms-job";
 
 export default {
   name: "IssueJobZP",
@@ -101,485 +72,47 @@ export default {
     drawerMixins,
     TableHeaderMixins,
     mixins,
-    newAndEdiDialogMixins
   ],
-  components:{libraryShiftSearch},
   computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.jobStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
     },
-    // hideButton: function () {
-    //   return function (val) {
-    //     let data = true
-    //     val.forEach(key => {
-    //       if (this.propsData.jobStatus == key) {
-    //         data = false
-    //       }
-    //     })
-    //     return data
-    //   }
-    // },
   },
-  data () {
+  data() {
     return {
-      URL: 'wms/store/issue-job',
-      tableLoading: false,
-      handleMultipleSelection: [],
+      URL: "wms/store/issue-job",
       //常用按钮数据
       currenButtonData: [
-        // this.defaultExportBtn(),//导出
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
         {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
+          type: 'success',
+          label: '完成',
           hide: false,
-          name: "print",
+          name: "CompleteJob",
+          hide: () => { return this.hideButton([1,2,4]) },
           size: 'mini'
         },
       ],
-      handleDetailsTableColumns: [
-        { label: "物品代码", prop: "itemCode", },
-        { label: "物品名称",  prop: "itemName" },
-        { label: "实际库位", prop: "handledLocationCode", },
-        { label: "推荐库位", prop: "recommendLocationCode", },
-        { label: "实际箱标签", prop: "handledPackingCode", },
-        { label: "推荐箱标签", prop: "recommendPackingCode", },
-        { label: "实际批次", prop: "handledLot", },
-        { label: "推荐批次", prop: "recommendLot", },
-        { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty", },
-        { type: "object", label: "实际单位", prop: "handledQty", showProp: "uom", },
-        { type: "object", label: "推荐数量", prop: "recommendQty", showProp: "qty", },
-        { type: "object", label: "推荐单位", prop: "recommendQty", showProp: "uom", },
-      ],
-      editOptions: {
-
-      },
-      handleFormData: {
-        id: null,
-        creationTime: null,
-        IssueNoteNumber: "123",
-        lastModificationTime: null,
-        remark: null,
-        concurrencyStamp: null,
-        company: null,
-        number: null,
-        upStreamJobNumber: null,
-        materialRequestNumber: null,
-        jobType: 1,
-        jobStatus: 1,
-        priority: 0,
-        priorityIncrement: 0,
-        wlgCode: "123",
-        isAutoComplete: true,
-        details: [],
-        acceptTime: null,
-        completeTime: null,
-        prodLine: null,
-        toLocationCode: null,
-      },
-      childTableData: [
-        {
-          "id": null,
-          "creationTime": null,
-          //   "creatorId": null,
-          "lastModificationTime": null,
-          //   "lastModifierId": null,
-          "remark": null,
-          "concurrencyStamp": null,
-          "masterID": null,
-          "packingCode": null,
-          "containerCode": null,
-          "item": {
-            "id": null,
-            "name": null,
-            "desc1": null,
-            "desc2": null
-          },
-          "itemCode": null,
-          "stdPack": {
-            "packUom": null,
-            "packQty": 0
-          },
-          "recommendBatch": {
-            "supplierBatch": null,
-            "produceDate": null
-          },
-          "recommendLot": "",
-          "recommendLocationCode": "",
-          "recomendQty": {
-            "uom": null,
-            "qty": 0
-          },
-          "handledBatch": {
-            "supplierBatch": null,
-            "produceDate": null
-          },
-          "handledLot": "",
-          "handledLocationCode": "",
-          "handledQty": {
-            "uom": null,
-            "qty": 0
-          },
-          "fromLocation": "",
-          "toLocation": "",
-          "workshop": null,
-          "prodLine": null,
-          "workCenter": null,
-        }
-      ],
-      handleForm: [
-        { type: "input", label: "任务编号", prop: "number", colSpan: 12, disabled: "true" },
-        { type: "input", label: "到货编号", prop: "arriveNumber", colSpan: 12, disabled: "true" },
-        { type: "select", label: "任务类型", prop: "jobType", options: "taskType", colSpan: 12, disabled: "true" },
-        { type: "select", label: "任务状态", prop: "jobStatus", options: "jobStatus", colSpan: 12, disabled: "true" },
-        { type: "input", label: "优先级", prop: "priority", colSpan: 12, disabled: "true" },
-        { type: "input", label: "工作组", prop: "wlgCode", colSpan: 12, disabled: "true" },
-        { type: "dateTime", label: "接收时间", prop: "acceptTime", colSpan: 12, },
-        { type: "input", label: "备注", prop: "remark", colSpan: 12, },
-        { type: "input", label: "生产线", prop: "prodLine", disabled: "true", colSpan: 12,  },
-        // { type: "autocomplete", label: "目标库位", prop: "toLocationCode", optionsLabel: "itemCode", optionsValue: "locationCode", focus: (val) => { return this.getSelectList(val, "wms/inventory/Inventory-Balance") }, click: (val) => { this.filterTable(val, 'wms/inventory/Inventory-Balance', 'InventoryBalance-PullForm', '库位选择') }, colSpan: 12 },
-        { type: "autocomplete", label: "目标库位", prop: "toLocationCode", optionsLabel: "name", optionsValue: "code", focus: (val) => { return this.getSelectList(val, "basedata/Location") }, click: (val) => { this.filterTable(val, 'basedata/Location', 'InventoryBalance-PullForm', '库位选择') }, colSpan: 12 },
-      ],
-      editRules: {
-        handleRule: {
-          number: [
-            { required: true, trigger: "blur", message: "不可为空" },
-          ],
-          jobType: [{ required: true, trigger: "blur", message: "不可为空" }],
-          jobStatus: [{ required: true, trigger: "blur", message: "不可为空" }],
-          priority: [{ required: true, trigger: "blur", message: "不可为空" }],
-          wlgCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-        },
-        cerateRule: {
-          itemCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-          toLocationCode: [{ required: false, trigger: "blur", message: "不可为空" }],
-          numberInput: [{ required: true, trigger: "blur", message: "不可为空" }],
-        }
-      },
-      libraryShiftShow:false,//查看库移弹窗显示
-      libraryShiftRow:null,//查看库移当前行数据
     };
   },
-  mounted () {
+  mounted() {
     this.paging();
-  },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        requestType: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params)
-        .then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    handleFormSubmit (val) {
-      let that = this
-      return new Promise((resolve, reject) => {
-        if (that.handleMultipleSelection.length == 0) {
-          that.$errorMsg('请先择提交的数据！')
-          reject()
-        } else {
-          if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
-            that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              that.checkHandleSubmit(resolve, reject)
-            }).catch(() => {
-              reject()
-            })
-          } else {
-            that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              that.checkHandleSubmit(resolve, reject)
-            }).catch(() => {
-              reject()
-            })
-          }
-        }
-      })
-    },
-    checkHandleSubmit(resolve, reject) {
-      let that = this
-      
-      let items = that.handleMultipleSelection.filter(r => {
-        return (r.handledPackingCode === null || r.handledPackingCode === '')
-      })
-
-      if (items.length > 0) {
-        let packingCodes = '';
-        items.forEach(r => {
-          packingCodes += r.recommendPackingCode + ','
-        })
-        that.$confirm('以下箱码对应的实际箱码为空,是否要继续发料?:[' + packingCodes + ']', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          that.finshIssueJobHandle(resolve, reject)
-        }).catch(() => {
-          return reject()
-        })
-      } else {
-        that.finshIssueJobHandle(resolve, reject)
-      }
-    },
-    finshIssueJobHandle(resolve, reject) {
-      let that = this
-      let data = {
-        id: that.propsData.id
-      }
-      that.handleMultipleSelection.forEach(item => {
-        item.toLocationCode = that.handleFormData.toLocationCode
-        item.handledContainerCode = item.recommendContainerCode;
-				item.handledPackingCode = item.recommendPackingCode;
-				item.handledBatch = item.recommendBatch;
-				item.handledLot = item.recommendLot;
-				item.handledLocationCode = item.recommendLocationCode;
-      })
-      let params = JSON.parse(JSON.stringify(that.handleFormData))
-      delete params.details
-      params.details = that.handleMultipleSelection
-      handle(params, data, that.URL).then(res => {
-        that.displayDialog.handleFromDialog = false;
-        that.$successMsg('已生成发料记录！')
-        that.paging()
-        return resolve()
-      }).catch(err => {
-        return reject();
-      })
-    },
-    // 输入框 变更
-    changeInput(prop, val) {
-      let that = this
-      if (prop == 'numberInput' ) {
-        this.$confirm('是否要将以下所有零件的需求数量更改为[' + val + ']', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          that.CreateFormData.details.forEach(item => {
-            item.numberDetails = parseInt(val)
-          })
-        }).catch(() => {
-        })
-      }
-    },
-    //新增——删除table
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
-    //新增-按钮
-    FormClick(val) {
-      let that = this
-      if (val[0] == 0) {
-      } else if (val[0] == 1) {
-        // 查询
-        this.editRules.cerateRule.toLocationCode[0].required = false
-        val[1].validate((valid) => {
-          if (valid) {
-            this.tableLoading = true
-            let params = {
-              condition: {
-                filters: [
-                  {
-                      logic: "And",
-                      column: "code",
-                      action: "==",
-                      value: that.CreateFormData.itemCode
-                  }
-                ]
-              },
-              Sorting: "",
-              SkipCount: 0,
-              MaxResultCount: 100
-            }
-            getPageList(params, 'basedata/item-basic').then(res => {
-              if (res.items.length == 0) {
-                this.$errorMsg('未查询到该物品信息!')
-              } else {
-                let findRs = that.CreateFormData.details.find(item => (
-                  item.code == that.CreateFormData.itemCode
-                ))
-                if (!findRs) {
-                  res.items.forEach(item => {
-                    item.numberDetails = 0
-                    that.CreateFormData.details.push(item)
-                  })
-                }
-              }
-              this.tableLoading = false
-            }).catch(err => {
-              console.log(err)
-              this.tableLoading = false
-            })
-          } else {
-            this.$errorMsg('请检查表单')
-          }
-        })
-      } else {
-        this.editRules.cerateRule.toLocationCode[0].required = true
-        val[1].validate((valid) => {
-          if (valid) {
-            if (this.CreateFormData.details.length > 0) {
-              let params = {
-                worker: store.getters.name.userName,
-                company: localStorage.getItem("company"),
-                details: [],
-              }
-              for (var i = 0; i < this.CreateFormData.details.length; i++) {
-                if (this.CreateFormData.details[i].numberDetails <= 0) {
-                  this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
-                  return
-                } else {
-                  params.details.push({
-                    itemCode: this.CreateFormData.details[i].code,
-                    item: {
-                      id: this.CreateFormData.details[i].id,
-                      name: this.CreateFormData.details[i].name,
-                      desc1: this.CreateFormData.details[i].desc1,
-                      desc2: this.CreateFormData.details[i].desc2,
-                    },
-                    qty: {
-                      uom: this.CreateFormData.details[i].basicUom,
-                      qty: this.CreateFormData.details[i].numberDetails
-                    },
-                    prodLine: '',
-                    status: this.CreateFormData.details[i].status,
-                    toLocationCode: this.CreateFormData.toLocationCode,
-                    worker: store.getters.name.userName,
-                  })
-                }
-              }
-              this.Loading.newAndEdiLoading = true
-              createAndHandle(params).then( res => {
-                this.displayDialog.newDialog = false
-                this.Loading.newAndEdiLoading = false
-                this.$successMsg("发料任务创建成功！")
-                this.paging()
-              }).catch(err => {
-                console.log(err)
-                this.Loading.newAndEdiLoading = false
-              })
-            } else {
-              this.$errorMsg('无数据可提交！')
-            }
-          } else {
-            this.$errorMsg('请检查表单')
-          }
-        })
-      }
-    },
-    drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        _propsData.title = "线边仓领料单"
-        _propsData.details.forEach(item=>{
-          item.recommendLot = item.recommendLot + " "
-        })
-        let _option = {
-          details:{
-            fromLocationCode:"recommendFromLocationCode",
-            qty:"handledQty",
-            fromLot:"recommendLot",
-            fromLocationErpCode:"recommendFromLocationErpCode",
-          }
-        }
-        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);
-        this.Print(data)
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    },
-    // drawerbutton(val) {
-    //   if (val == 'handleJob') {
-    //     this.Loading.appMainLoading = true
-    //     let propsData = JSON.parse(JSON.stringify(this.propsData));
-    //     this.$listAssign(this.handleFormData, propsData)
-    //     this.handleFormData.toLocationCode = this.handleFormData.details[0].toLocationCode
-    //     this.handleMultipleSelection = []
-    //     this.Loading.appMainLoading = false
-    //     this.formTitle = "执行" + this.$route.meta.title;
-    //     this.displayDialog.handleFromDialog = true
-    //   } else {
-    //     drawerMixins.methods.drawerbutton(val, this)
-    //   }
-    // },
-    handleSelectionChange(val) {
-      this.handleMultipleSelection = val
-    },
-    showLibraryShift(scope){
-      if(!scope.row.tenantId){return this.$errorMsg("事务类型有误")}
-      this.libraryShiftShow = true
-      this.libraryShiftRow = scope
-    },
-    closeLibraryShift(data){
-      this.libraryShiftShow = data
-      this.libraryShiftRow = null
-    }
   }
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/mainbasicData.scss";
-::v-deep .newAndEdiDialog {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  .el-form {
-    flex: 1;
-    display: flex;
-    justify-content: flex-start;
-    align-content: flex-start;
-    flex-wrap: wrap;
-    overflow: hidden;
-    overflow-y: auto;
-  }
-  .screen-push {
-    color: rgb(64, 158, 255);
-    span {
-      cursor: pointer;
-      &:hover {
-        color: blue;
-      }
-    }
-  }
-  .formButton {
-    padding: 20px 20px 20px 0;
-  }
-  .formTable-box {
-      height: 70% !important;
-
-      .el-form-item__content {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-        margin: 0 !important;
-      }
-    }
-}
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZP/IssueNoteZP.vue b/fe/PC/src/views/materialIssueManage/ZP/IssueNoteZP.vue
index 2c6f56858..a24082619 100644
--- a/fe/PC/src/views/materialIssueManage/ZP/IssueNoteZP.vue
+++ b/fe/PC/src/views/materialIssueManage/ZP/IssueNoteZP.vue
@@ -24,16 +24,27 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 抽屉 -->
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
       :propsData="propsData"
-      :Butttondata="DrawerButtonData"
       :tabsDesTions="tabsDesTions"
+      :Butttondata="[]"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
       @handleCommand="drawerHandle"
       @close-value="closeValue"
       :tableColumns="detailsTableColumns"
@@ -45,13 +56,11 @@
   </div>
 </template>
 <script>
-import { materialRequestByType } from "@/api/wms-api"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { initPrintAllData } from "@/mixins/printMixin"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
 export default {
   name: "IssueNoteZP",
   mixins: [
@@ -61,69 +70,23 @@ export default {
     TableHeaderMixins,
     mixins,
   ],
-  data () {
+  data() {
     return {
-      URL: 'wms/store/issue-note',
+      URL: "wms/store/issue-note",
       //常用按钮数据
       currenButtonData: [
-        this.defaultExportBtn(),//导出
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
-      DrawerButtonData: [
-        {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
-          hide: false,
-          name: "print",
-          size: 'mini'
-        },
-      ]
     };
   },
-  mounted () {
+  mounted() {
     this.paging();
   },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        requestType: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        // _propsData.title = "送货单"
-        _propsData.title = "线边仓领料单"
-        _propsData.details.forEach(item=>{
-          item.fromLot = item.fromLot + " "
-        })
-        let _option = {
-          number:"requestNumber",
-        }
-        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);
-        this.Print(data)
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    }
-  },
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/basicData.scss";
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZP/IssueRequestZP.vue b/fe/PC/src/views/materialIssueManage/ZP/IssueRequestZP.vue
index ec54dccd3..c7e913c1e 100644
--- a/fe/PC/src/views/materialIssueManage/ZP/IssueRequestZP.vue
+++ b/fe/PC/src/views/materialIssueManage/ZP/IssueRequestZP.vue
@@ -30,15 +30,13 @@
       :loading="Loading.importLoading"
       :show="displayDialog.importDialog"
       :URL="URL"
-      :disabledMethod="{ method1: false, method2: false, method3: false }"
-      :disabledIsAllowPartImport="{
-        isAllowPartImport1: false,
-        isAllowPartImport2: false,
-      }"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
       isAllowPartImportValue="1"
       @importClick="postImportMergeClick(arguments)"
       @postImportDown="importDown"
     ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
@@ -48,8 +46,8 @@
       :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
       @close-value="closeValue"
-      :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
       :totalCount="totalCountDetails"
       :MaxResultCount="MaxResultCountDetails"
@@ -59,14 +57,11 @@
   </div>
 </template>
 <script>
-import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { requestData } from "@/utils/processButtonData"
-import requestDataNames from "@/utils/processButtonData"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
 export default {
   name: "IssueRequestZP",
   mixins: [
@@ -77,150 +72,63 @@ export default {
     mixins,
   ],
   computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.requestStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
     },
   },
-  data () {
-    let _this = this;
+  data() {
     return {
-      URL: 'wms/store/material-request',
-      tableLoading: false,
-      handleMultipleSelection: [],
+      URL: "wms/store/material-request",
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+      //   this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
-      //执行前获取记录数据暂存
-      oldIssueJobIds: [],
       DrawerButtonData: [
-        // ...requestData(this),
         {
-          type: 'success',
-          label: '完成',
-          hide: () => { return this.completeRequestInit([2,6])},
-          name: "completeRequest",
+          type: 'warning',
+          label: '执行',
+          hide: false,
+          name: "handleGetIds",
+          hide: () => { return this.hideButton([1,5,9]) },
+          size: 'mini',
+          handleGetJobsUrl:'wms/store/material-job',
+          // handleRequestUrl:'wms/store/kitting-issue-request',
+        },
+        {
+          type: 'danger',
+          label: '取消',
+          hide: false,
+          name: "cancelRequest",
+          hide: () => { return this.hideButton([1,5,9]) },
           size: 'mini'
         },
         {
-          type: 'warning',
-          label: '执行',
-          name: "IssueRequest-zx",
-          hide: () => { return this.againHandleRequestInit([9])},
+          type: 'success',
+          label: '完成',
+          hide: false,
+          name: "completeRequest",
+          hide: () => { return this.hideButton([1,5,9]) },
           size: 'mini'
         },
-        ...requestData(this,false,false,[requestDataNames.againHandle]),
       ],
     };
   },
-  mounted () {
-    this.paging()
+  mounted() {
+    this.paging();
   },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        type: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    // 重新定义【完成按钮】显示判断 除了2(待审批) 和 6（完成状态）都显示（abortRequestRequestInit）
-    completeRequestInit(val){
-      let data = false
-      val.forEach(key => {
-        if (this.propsData.requestStatus == key) {
-          data = true
-        }
-      })
-      return data
-    },
-    // 定义【执行按钮】显示判断 ==9时候显示
-    againHandleRequestInit(val){
-      let data = true
-      val.forEach(key => {
-        if (this.propsData.requestStatus == key) {
-          data = false
-        }
-      })
-      return data
-    },
-    // 执行成功后处理
-    handleResult(){
-      getDetailed(this.propsData.id, this.URL).then(res => {
-        this.propsData = res
-      })
-      this.paging()
-      this.Loading.appMainLoading = false
-    },
-    //抽屉常用按钮
-    drawerbutton (val) {
-      // 执行
-      if(val == 'IssueRequest-zx'){
-        this.Loading.appMainLoading = true
-        // 获取记录数据暂存
-        processRequest(this.propsData.number,'wms/store/issue-job/by-request-number/').then(resFirst=>{
-          this.oldIssueJobIds = []
-          resFirst.forEach(item=>{
-            this.oldIssueJobIds.push(item.id)
-          })
-          // 执行操作
-          processRequest(this.propsData.id, this.URL + '/handle/').then(resHandle => {
-            // 重新获取记录对比
-            processRequest(this.propsData.number,'wms/store/issue-job/by-request-number/').then(resNew=>{
-              // 重新获取的记录为空（未生成任务）
-              if(!resNew || resNew.length <= 0){
-                this.$errorMsg('没有可用库存，未生成新任务')
-                this.handleResult()
-                return
-              }
-              // 当前有记录
-              if(resNew && resNew.length > 0){
-                let _newIds = []
-                resNew.forEach(item=>{
-                  _newIds.push(item.id)
-                })
-                if(this.oldIssueJobIds.sort().toString() === _newIds.sort().toString()){
-                  let mes = '未生成任务原因: ' + `<br/>` + '1、该请求中的【物品】的【实际发货数量】小于【请求数量】,请确认数量后点击【完成】。' + `<br/>` + '2、该请求中的【库存余额】小于【请求数量】,请确认数量后点击【执行】'
-                  this.$alert(mes,
-                    '错误提示', {
-                    confirmButtonText: '确定',
-                    dangerouslyUseHTMLString: true
-                  })
-                }else{
-                  this.$successMsg('执行成功，已生成新任务')
-                }
-                this.handleResult()
-              }
-            })
-          }).catch(err => {
-            console.log(err)
-            this.Loading.appMainLoading = false
-          })
-        }).catch(err => {
-          console.log(err)
-          this.Loading.appMainLoading = false
-        })
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    },
-  }
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/mainbasicData.scss";
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
index 7b0b46e7d..1e523db87 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
@@ -30,15 +30,13 @@
       :loading="Loading.importLoading"
       :show="displayDialog.importDialog"
       :URL="URL"
-      :disabledMethod="{ method1: false, method2: false, method3: false }"
-      :disabledIsAllowPartImport="{
-        isAllowPartImport1: false,
-        isAllowPartImport2: false,
-      }"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
       isAllowPartImportValue="1"
       @importClick="postImportMergeClick(arguments)"
       @postImportDown="importDown"
     ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
@@ -47,9 +45,9 @@
       :tabsDesTions="tabsDesTions"
       :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbuttonHandle"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
       @close-value="closeValue"
-      :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
       :totalCount="totalCountDetails"
       :MaxResultCount="MaxResultCountDetails"
@@ -59,13 +57,13 @@
   </div>
 </template>
 <script>
-import { getDetailed } from "@/api/wms-api"
-import { close } from "@/api/wms-job"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
+import { complete } from "@/api/wms-job";
+
 export default {
   name: "IssueJobZS",
   mixins: [
@@ -76,7 +74,6 @@ export default {
     mixins,
   ],
   computed: {
-    //按钮显示
     hideButton: function () {
       return function (val) {
         let data = true
@@ -89,71 +86,33 @@ export default {
       }
     },
   },
-  data () {
-    let _this = this;
+  data() {
     return {
-      URL: 'wms/store/injection-issue-job',
+      URL: "wms/store/injection-issue-job",
       //常用按钮数据
       currenButtonData: [
         // this.defaultImportBtn(),//导入
-        this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
         {
-          type: 'danger',
-          label: '中止',
-          hide: () => { return this.hideButton([1,2,4])},
-          name: "break",
+          type: 'success',
+          label: '完成',
+          hide: false,
+          name: "CompleteJob",
+          hide: () => { return this.hideButton([1,2,4]) },
           size: 'mini'
         },
       ],
     };
   },
-  mounted () {
-    this.paging()
-  },
-  methods: {
-    // 操作成功后处理
-    handleResult(){
-      getDetailed(this.propsData.id, this.URL).then(res => {
-        this.propsData = res
-      })
-      this.paging()
-      this.Loading.appMainLoading = false
-    },
-    //抽屉常用按钮
-    drawerbuttonHandle (val) {
-      // 中止
-      if(val == 'break'){
-        this.$confirm('是否确定中止任务?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          distinguishCancelAndClose: true,
-          closeOnClickModal: false,
-          type: 'warning'
-        }).then(() => {
-          this.Loading.appMainLoading = true
-          close(this.URL,this.propsData).then(res => {
-            this.$successMsg('已中止任务')
-            this.Loading.appMainLoading = false
-            getDetailed(this.propsData.id, this.URL).then(res => {
-              this.propsData = res
-            })
-            this.paging();
-          }).catch(err => {
-            this.Loading.appMainLoading = false
-          })
-        })
-      } else {
-        this.drawerbutton(val, this)
-      }
-    },
+  mounted() {
+    this.paging();
   }
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/mainbasicData.scss";
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
index e30222a04..d62555fb2 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
@@ -24,16 +24,27 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 抽屉 -->
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
       :propsData="propsData"
-      :Butttondata="DrawerButtonData"
       :tabsDesTions="tabsDesTions"
+      :Butttondata="[]"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
       @handleCommand="drawerHandle"
       @close-value="closeValue"
       :tableColumns="detailsTableColumns"
@@ -45,13 +56,11 @@
   </div>
 </template>
 <script>
-import { materialRequestByType } from "@/api/wms-api"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { initPrintAllData } from "@/mixins/printMixin"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
 export default {
   name: "IssueNoteZS",
   mixins: [
@@ -61,27 +70,23 @@ export default {
     TableHeaderMixins,
     mixins,
   ],
-  data () {
+  data() {
     return {
-      URL: 'wms/store/injection-issue-note',
+      URL: "wms/store/injection-issue-note",
       //常用按钮数据
       currenButtonData: [
-        this.defaultExportBtn(),//导出
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
-      DrawerButtonData: []
     };
   },
-  mounted () {
+  mounted() {
     this.paging();
   },
-  methods: {
-    
-  },
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/basicData.scss";
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
index fffe9a4fa..60f9449f9 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
@@ -30,15 +30,13 @@
       :loading="Loading.importLoading"
       :show="displayDialog.importDialog"
       :URL="URL"
-      :disabledMethod="{ method1: false, method2: false, method3: false }"
-      :disabledIsAllowPartImport="{
-        isAllowPartImport1: false,
-        isAllowPartImport2: false,
-      }"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
       isAllowPartImportValue="1"
       @importClick="postImportMergeClick(arguments)"
       @postImportDown="importDown"
     ></importFile>
+    <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
@@ -47,9 +45,9 @@
       :tabsDesTions="tabsDesTions"
       :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbuttonHandle"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
       @close-value="closeValue"
-      :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
       :totalCount="totalCountDetails"
       :MaxResultCount="MaxResultCountDetails"
@@ -59,12 +57,11 @@
   </div>
 </template>
 <script>
-import { getDetailed,postAbort } from "@/api/wms-api"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
 export default {
   name: "IssueRequestZS",
   mixins: [
@@ -75,7 +72,6 @@ export default {
     mixins,
   ],
   computed: {
-    //按钮显示
     hideButton: function () {
       return function (val) {
         let data = true
@@ -88,71 +84,51 @@ export default {
       }
     },
   },
-  data () {
-    let _this = this;
+  data() {
     return {
-      URL: 'wms/store/injection-issue-request',
+      URL: "wms/store/injection-issue-request",
       //常用按钮数据
       currenButtonData: [
-        // this.defaultImportBtn(),//导入
-        this.defaultExportBtn(),//导出
+      //   this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
+        {
+          type: 'warning',
+          label: '执行',
+          hide: false,
+          name: "handleGetIds",
+          hide: () => { return this.hideButton([1,5,9]) },
+          size: 'mini',
+          handleGetJobsUrl:'wms/store/injection-issue-job',
+          // handleRequestUrl:'wms/store/kitting-issue-request',
+        },
         {
           type: 'danger',
-          label: '中止',
-          hide: () => { return this.hideButton([1,4,9])},
-          name: "break",
+          label: '取消',
+          hide: false,
+          name: "cancelRequest",
+          hide: () => { return this.hideButton([1,5,9]) },
+          size: 'mini'
+        },
+        {
+          type: 'success',
+          label: '完成',
+          hide: false,
+          name: "completeRequest",
+          hide: () => { return this.hideButton([1,5,9]) },
           size: 'mini'
         },
       ],
     };
   },
-  mounted () {
-    this.paging()
+  mounted() {
+    this.paging();
   },
-  methods: {
-    // 操作成功后处理
-    handleResult(){
-      getDetailed(this.propsData.id, this.URL).then(res => {
-        this.propsData = res
-      })
-      this.paging()
-      this.Loading.appMainLoading = false
-    },
-    //抽屉常用按钮
-    drawerbuttonHandle (val) {
-      // 中止
-      if(val == 'break'){
-        this.$confirm('是否确定中止请求?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          distinguishCancelAndClose: true,
-          closeOnClickModal: false,
-          type: 'warning'
-        }).then(() => {
-          this.Loading.appMainLoading = true
-          postAbort(this.propsData.id, this.URL).then(res => {
-            this.$successMsg('已中止请求')
-            this.Loading.appMainLoading = false
-            getDetailed(this.propsData.id, this.URL).then(res => {
-              this.propsData = res
-            })
-            this.paging();
-          }).catch(err => {
-            this.Loading.appMainLoading = false
-          })
-        })
-      } else {
-        this.drawerbutton(val, this)
-      }
-    },
-  }
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/mainbasicData.scss";
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file