Browse Source

Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

jingbb 2 days ago
parent
commit
ca1e866410
20 changed files with 942 additions and 746 deletions
  1. 1 1
      src/utils/request.js
  2. 36 1
      src/views/production/materialprocurement/materialProcurementList.vue
  3. 2 1
      src/views/production/materialprocurement/modules/materialProcurementAdd.vue
  4. 12 12
      src/views/production/productionTotalOrder/modules/KSOutbound.vue
  5. 12 12
      src/views/production/productionTotalOrder/modules/KSWarehousing.vue
  6. 7 7
      src/views/production/productionTotalOrder/modules/SurplusMaterials.vue
  7. 6 6
      src/views/production/productionTotalOrder/modules/SurplusMaterialsDetail.vue
  8. 6 6
      src/views/production/productionTotalOrder/modules/TemporaryStorage.vue
  9. 7 7
      src/views/production/productionTotalOrder/modules/TemporaryStorageDetail.vue
  10. 6 6
      src/views/production/productionTotalOrder/modules/materiaWaring.vue
  11. 7 7
      src/views/production/productionTotalOrder/modules/material.vue
  12. 6 6
      src/views/production/productionTotalOrder/modules/materialDetail.vue
  13. 14 14
      src/views/production/productionTotalOrder/modules/productDetails.vue
  14. 12 12
      src/views/production/productionTotalOrder/modules/productDetailsParticulars.vue
  15. 12 12
      src/views/production/productionTotalOrder/modules/productWarehousModel.vue
  16. 2 1
      src/views/production/productionTotalOrder/modules/productionTotalOrderAdd.vue
  17. 717 635
      src/views/production/productionTotalOrder/productionTotalOrderList.vue
  18. 36 0
      src/views/production/safetyStock/encoderList.vue
  19. 5 0
      src/views/production/safetyStock/modules/EncoderDetail.vue
  20. 36 0
      src/views/production/safetyStock/safetyStockList.vue

+ 1 - 1
src/utils/request.js

@@ -19,7 +19,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' //add
 const service = axios.create({
   //baseURL: '/nbcio-boot',
   baseURL: apiBaseUrl, // api base_url
-  timeout: 9000 // 请求超时时间
+  timeout: 120000 // 请求超时时间
 })
 
 const err = (error) => {

+ 36 - 1
src/views/production/materialprocurement/materialProcurementList.vue

@@ -84,6 +84,7 @@
         <a-button  size="small" @click="examineApprove">审批</a-button>
         <a-button  size="small" @click="abstainExamineApprove">弃审</a-button>
         <a-button size="small" @click="exportList('材料请购单')">导出</a-button>
+        <a-button size="small" @click="exportXlsModelCLQGD('材料请购单导入模板')">下载导入模板</a-button>
         <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"  @change="handleUploadChange" :action="importExcelUrl">
             <a-button  size="small">导入</a-button>
         </a-upload>
@@ -560,6 +561,40 @@
            })   
          }
         })
+      },
+       //导出
+       exportXlsModelCLQGD(fileName){
+        this.$confirm({
+          title: '确认导出',
+          content: '是否导出模板?',
+          onOk:  ()=> {
+            alertModal.loading("执行中,请稍后!")
+            let param = this.queryParam;
+            if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+              param['selections'] = this.selectedRowKeys.join(",")
+            }
+            downFile('/materialRequisition/madeMaterialRequisition/exportXlsModelCLQGD', param).then(data => {
+              alertModal.closeLoading();
+              if (!data) {
+                this.$message.warning('文件下载失败')
+                return
+              }
+              if (typeof window.navigator.msSaveBlob !== 'undefined') {
+                window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx')
+              } else {
+                let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+                let link = document.createElement('a')
+                link.style.display = 'none'
+                link.href = url
+                link.setAttribute('download', fileName + '.xlsx')
+                document.body.appendChild(link)
+                link.click()
+                document.body.removeChild(link) // 下载完成移除元素
+                window.URL.revokeObjectURL(url) // 释放掉blob对象
+              }
+           })   
+         }
+        })
       },
       handleUploadChange({ file, fileList }){
                 if (file.status === 'done'&&file.response.success) {
@@ -575,7 +610,7 @@
         var arrType = []
         var content = '是否同步请购单'
         this.selectedRows.map(item=>{
-          arrType.push(item.type)
+          // arrType.push(item.type)
           if(item.state=='已请购'){
             content='所选数据含有已请购数据,是否再次同步!'
           }

+ 2 - 1
src/views/production/materialprocurement/modules/materialProcurementAdd.vue

@@ -730,7 +730,8 @@
             onSearchPerson(){
                 if(this.form.orgName&&this.form.orgName!==''){
                     this.$refs.OperatorsPopup.visible = true
-                    this.$refs.OperatorsPopup.getData(this.form.planOrg,this.form.planDeptId?this.form.planDeptId:'')
+                    // this.$refs.OperatorsPopup.getData(this.form.planOrg,this.form.planDeptId?this.form.planDeptId:'')
+                    this.$refs.OperatorsPopup.getData(this.form.planOrg,'')
                 }else{
                     this.$message.warning("请选择组织!")
                 }

+ 12 - 12
src/views/production/productionTotalOrder/modules/KSOutbound.vue

@@ -95,12 +95,12 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '开票类型',
-                    align:"center",
-                    dataIndex: 'billingType',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '开票类型',
+                //     align:"center",
+                //     dataIndex: 'billingType',
+                //     ellipsis: true,
+                // },
                 {
                     title: '项目编码',
                     align:"center",
@@ -158,12 +158,12 @@
                     scopedSlots: { customRender: 'fanFreight' } ,
                     slots:{title:'fanFreightTitle'},
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                // },
                 {
                     title: '成品计量单位',
                     align:"center",

+ 12 - 12
src/views/production/productionTotalOrder/modules/KSWarehousing.vue

@@ -79,12 +79,12 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '开票类型',
-                    align:"center",
-                    dataIndex: 'billingType',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '开票类型',
+                //     align:"center",
+                //     dataIndex: 'billingType',
+                //     ellipsis: true,
+                // },
                 {
                     title: '项目编码',
                     align:"center",
@@ -127,12 +127,12 @@
                     scopedSlots: { customRender: 'executeOutLeafNow' } ,
                     slots:{title:'executeOutLeafNowTitle'},
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                // },
                 {
                     title: '成品计量单位',
                     align:"center",

+ 7 - 7
src/views/production/productionTotalOrder/modules/SurplusMaterials.vue

@@ -221,13 +221,13 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'batch' } 
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                //     scopedSlots: { customRender: 'batch' } 
+                // },
                 {
                     // title: '料品编码',
                     align:"center",

+ 6 - 6
src/views/production/productionTotalOrder/modules/SurplusMaterialsDetail.vue

@@ -60,12 +60,12 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                // },
                 {
                     title: '料品编码',
                     align:"center",

+ 6 - 6
src/views/production/productionTotalOrder/modules/TemporaryStorage.vue

@@ -60,12 +60,12 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                // },
                 {
                     title: '料品编码',
                     align:"center",

+ 7 - 7
src/views/production/productionTotalOrder/modules/TemporaryStorageDetail.vue

@@ -60,13 +60,13 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'batch' } 
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                //     scopedSlots: { customRender: 'batch' } 
+                // },
                 {
                     title: '料品编码',
                     align:"center",

+ 6 - 6
src/views/production/productionTotalOrder/modules/materiaWaring.vue

@@ -126,12 +126,12 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                // },
                 {
                     title: '料品编码',
                     align:"center",

+ 7 - 7
src/views/production/productionTotalOrder/modules/material.vue

@@ -227,13 +227,13 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'batch' } 
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                //     scopedSlots: { customRender: 'batch' } 
+                // },
                 {
                     // title: '料品编码',
                     align:"center",

+ 6 - 6
src/views/production/productionTotalOrder/modules/materialDetail.vue

@@ -58,12 +58,12 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                // },
                 {
                     title: '料品编码',
                     align:"center",

+ 14 - 14
src/views/production/productionTotalOrder/modules/productDetails.vue

@@ -262,13 +262,13 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '开票类型',
-                    align:"center",
-                    dataIndex: 'billingType',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'billingType' } 
-                },
+                // {
+                //     title: '开票类型',
+                //     align:"center",
+                //     dataIndex: 'billingType',
+                //     ellipsis: true,
+                //     scopedSlots: { customRender: 'billingType' } 
+                // },
                 {
                     title: '项目编码',
                     align:"center",
@@ -281,13 +281,13 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'batch' } 
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                //     scopedSlots: { customRender: 'batch' } 
+                // },
                 {
                     // title: '料品编码',
                     align:"center",

+ 12 - 12
src/views/production/productionTotalOrder/modules/productDetailsParticulars.vue

@@ -48,12 +48,12 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '开票类型',
-                    align:"center",
-                    dataIndex: 'billingType',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '开票类型',
+                //     align:"center",
+                //     dataIndex: 'billingType',
+                //     ellipsis: true,
+                // },
                 {
                     title: '项目编码',
                     align:"center",
@@ -66,12 +66,12 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                // },
                 {
                     title: '料品编码',
                     align:"center",

+ 12 - 12
src/views/production/productionTotalOrder/modules/productWarehousModel.vue

@@ -72,12 +72,12 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '开票类型',
-                    align:"center",
-                    dataIndex: 'billingType',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '开票类型',
+                //     align:"center",
+                //     dataIndex: 'billingType',
+                //     ellipsis: true,
+                // },
                 {
                     title: '项目编码',
                     align:"center",
@@ -90,12 +90,12 @@
                     dataIndex: 'projectName',
                     ellipsis: true,
                 },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                },
+                // {
+                //     title: '批次',
+                //     align:"center",
+                //     dataIndex: 'batch',
+                //     ellipsis: true,
+                // },
                 {
                     title: '料品编码',
                     align:"center",

+ 2 - 1
src/views/production/productionTotalOrder/modules/productionTotalOrderAdd.vue

@@ -381,7 +381,8 @@
             onSearchPerson(){
                 if(this.form.orgName&&this.form.orgName!==''){
                     this.$refs.OperatorsPopup.visible = true
-                    this.$refs.OperatorsPopup.getData(this.form.pkOrg,this.form.planDeptId?this.form.planDeptId:'')
+                    // this.$refs.OperatorsPopup.getData(this.form.pkOrg,this.form.planDeptId?this.form.planDeptId:'')
+                    this.$refs.OperatorsPopup.getData(this.form.pkOrg,'')
                 }else{
                     this.$message.warning('请选择生产组织!')
                 }

+ 717 - 635
src/views/production/productionTotalOrder/productionTotalOrderList.vue

@@ -1,86 +1,86 @@
 <template>
-    <div>
-        <a-card :bordered="false" class="top" style="margin-bottom:1%">
-      
-          <!-- 查询区域 -->
-          <div class="table-page-search-wrapper">
-            <a-form layout="inline" @keyup.enter.native="searchQuery">
-              <a-row :gutter="24">
-                <a-col :md="4" :sm="24">
-                  <a-form-item label="生产组织">
-                    <a-input placeholder="请输入" v-model="queryParam.orgName" ></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col  :md="4" :sm="24">
-                  <a-form-item label="单据号">
-                    <a-input placeholder="请输入" v-model="queryParam.orderCode"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="4" :sm="24">
-                    <a-form-item label="单据日期">
-                    <a-range-picker v-model="orderDate"  style="width: 100%;" @change="changeStartDate" />
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="单据状态">
-                      <a-select v-model="queryParam.state"  style='width:100%' >
-                        <a-select-option value='开立'> 开立</a-select-option>
-                        <a-select-option value='审核'> 审核</a-select-option>
-                        <a-select-option value='已运算'> 已运算</a-select-option>
-                        <a-select-option value='关闭'> 关闭</a-select-option>
-                       </a-select>
-                    </a-form-item>
-                  </a-col>
-                <template v-if="toggleSearchStatus">
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="业务员">
-                      <a-input placeholder="请输入" v-model="queryParam.salesperson"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="计划部门">
-                    <a-input placeholder="请输入" v-model="queryParam.planDept" ></a-input>
-                  </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="项目">
-                      <a-input placeholder="请输入" v-model="queryParam.projectName"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="备注">
-                      <a-input placeholder="请输入" v-model="queryParam.remarks"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="业务类型">
-                      <a-select v-model="queryParam.type"  style='width:100%' >
-                        <a-select-option value='工装'> 工装</a-select-option>
-                        <a-select-option value='家装'> 家装</a-select-option>
-                       </a-select>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="加工单号">
-                      <a-input placeholder="请输入" v-model="queryParam.workNo"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="制单人">
-                      <a-input placeholder="请输入" v-model="queryParam.createBy"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="审核人">
-                      <a-input placeholder="请输入" v-model="queryParam.reviewer"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="4" :sm="24">
-                    <a-form-item label="项目编码">
-                      <a-input placeholder="请输入" v-model="queryParam.projectCode"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <!-- <a-col :md="4" :sm="24">
+  <div>
+    <a-card :bordered="false" class="top" style="margin-bottom:1%">
+
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="生产组织">
+                <a-input placeholder="请输入" v-model="queryParam.orgName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="单据号">
+                <a-input placeholder="请输入" v-model="queryParam.orderCode"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="单据日期">
+                <a-range-picker v-model="orderDate" style="width: 100%;" @change="changeStartDate" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="单据状态">
+                <a-select v-model="queryParam.state" style='width:100%'>
+                  <a-select-option value='开立'> 开立</a-select-option>
+                  <a-select-option value='审核'> 审核</a-select-option>
+                  <a-select-option value='已运算'> 已运算</a-select-option>
+                  <a-select-option value='关闭'> 关闭</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <template v-if="toggleSearchStatus">
+              <a-col :md="4" :sm="24">
+                <a-form-item label="业务员">
+                  <a-input placeholder="请输入" v-model="queryParam.salesperson"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="计划部门">
+                  <a-input placeholder="请输入" v-model="queryParam.planDept"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="项目">
+                  <a-input placeholder="请输入" v-model="queryParam.projectName"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="备注">
+                  <a-input placeholder="请输入" v-model="queryParam.remarks"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="业务类型">
+                  <a-select v-model="queryParam.type" style='width:100%'>
+                    <a-select-option value='工装'> 工装</a-select-option>
+                    <a-select-option value='家装'> 家装</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="加工单号">
+                  <a-input placeholder="请输入" v-model="queryParam.workNo"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="制单人">
+                  <a-input placeholder="请输入" v-model="queryParam.createBy"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="审核人">
+                  <a-input placeholder="请输入" v-model="queryParam.reviewer"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="项目编码">
+                  <a-input placeholder="请输入" v-model="queryParam.projectCode"></a-input>
+                </a-form-item>
+              </a-col>
+              <!-- <a-col :md="4" :sm="24">
                     <a-form-item label="来源标识">
                       <a-input placeholder="请输入" v-model="queryParam.sourceInfo"></a-input>
                     </a-form-item>
@@ -95,566 +95,648 @@
                       <a-input placeholder="请输入" v-model="queryParam.createTime"></a-input>
                     </a-form-item>
                   </a-col> -->
-                </template>
-                <a-col  :md="4" :sm="24">
-                  <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                    <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-                    <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-                    <a @click="handleToggleSearch" style="margin-left: 8px">
-                      {{ toggleSearchStatus ? '收起' : '展开' }}
-                      <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                    </a>
-                  </span>
-                </a-col>
-      
-              </a-row>
-            </a-form>
-          </div>
-        </a-card>
-        
-        <a-card class="middle" style="margin-bottom:1%">
-          <!-- 操作按钮区域 -->
-          <div class="table-operator">
-            <a-button type="danger" size="small" @click='addList'>新增</a-button>
-            <a-button  size="small" @click="editList">修改</a-button>
-            <a-button  size="small" @click='actionList'>订单操作</a-button>
-            <a-button type="danger" size="small" @click="delecteList">删除</a-button>
-            <a-button  size="small" @click="detailList">详情</a-button>
-            <a-button  size="small" @click="examineApprove">审批</a-button>
-            <a-button  size="small" @click="abstainExamineApprove">弃审</a-button>
-            <a-button size="small" @click="exportList('生产总订单列表')">导出</a-button>
-            <a-upload name="file" :showUploadList="false" @change="handleUploadChange" :multiple="false" :headers="tokenHeader" :action="fileUpload">
-                <a-button  size="small">导入</a-button>
-            </a-upload>
-            <a-button type="danger"  size="small" @click="entireClose">整单关闭</a-button>
-          </div>
-      
-          <!-- table区域-begin -->
-          <div>  
-            <a-table
-              ref="table"
-              size="middle"
-              bordered
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource"
-              :pagination="ipagination"
-              :scroll="{ x: 2000, y: 300 }"
-              :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-              @change="handleTableChange"
-              :customRow ="clickRow"
-              >
-      
-            </a-table>
-          </div>
-          <!-- table区域-end -->
-      
-        </a-card>
-        <productionTotalOrderAdd ref="productionTotalOrderAdd" @ok='searchQuery'></productionTotalOrderAdd>
-        <productionTotalOrderDetail ref="productionTotalOrderDetail" @ok='searchQuery'></productionTotalOrderDetail>
-    </div>
-    </template>
-      
-      <script>
-        import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-        import moment from 'dayjs'
-        import { httpAction ,getAction,postAction,putAction,deleteAction,downFile} from '@/api/manage'
-        import productionTotalOrderAdd from './modules/productionTotalOrderAdd'
-        import productionTotalOrderDetail from './modules/productionTotalOrderDetail'
-        import {queryDepartTreeList} from '@/api/api'
-        import alertModal from '../../../plugins/modal'
-        import { Message } from "element-ui";
-        //---------workflow  by fhf end -------------
-        export default {
-          name: "materialProcurementList",
-          mixins: [JeecgListMixin],
-          components: {
-            productionTotalOrderAdd,
-            productionTotalOrderDetail
+            </template>
+            <a-col :md="4" :sm="24">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                <a @click="handleToggleSearch" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+                </a>
+              </span>
+            </a-col>
+
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+
+    <a-card class="middle" style="margin-bottom:1%">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator">
+        <a-button type="danger" size="small" @click='addList'>新增</a-button>
+        <a-button size="small" @click="editList">修改</a-button>
+        <a-button :disabled="isDisabledAuth('madeProductionOrders:execute')" size="small"
+          @click='actionList'>订单操作</a-button>
+        <a-button type="danger" size="small" @click="delecteList">删除</a-button>
+        <a-button size="small" @click="detailList">详情</a-button>
+        <a-button :disabled="isDisabledAuth('madeProductionOrders:examine')" size="small"
+          @click="examineApprove">审批</a-button>
+        <a-button :disabled="isDisabledAuth('madeProductionOrders:examine')" size="small"
+          @click="abstainExamineApprove">弃审</a-button>
+        <a-button size="small" @click="exportList('生产总订单列表')">导出</a-button>
+        <a-button size="small" @click="exportXlsModelSCZDD('生产总订单导入模板')">下载导入模板</a-button>
+        <a-upload name="file" :showUploadList="false" @change="handleUploadChange" :multiple="false"
+          :headers="tokenHeader" :action="fileUpload">
+          <a-button size="small">导入</a-button>
+        </a-upload>
+        <a-button :disabled="isDisabledAuth('madeProductionOrders:close')" type="danger" size="small"
+          @click="entireClose">整单关闭</a-button>
+      </div>
+
+      <!-- table区域-begin -->
+      <div>
+        <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+          :pagination="ipagination" :scroll="{ x: 2000, y: 300 }"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"
+          :customRow="clickRow">
+
+        </a-table>
+      </div>
+      <!-- table区域-end -->
+
+    </a-card>
+    <productionTotalOrderAdd ref="productionTotalOrderAdd" @ok='searchQuery'></productionTotalOrderAdd>
+    <productionTotalOrderDetail ref="productionTotalOrderDetail" @ok='searchQuery'></productionTotalOrderDetail>
+  </div>
+</template>
+
+<script>
+  import {
+    disabledAuthFilter
+  } from "@/utils/authFilter"
+  import {
+    JeecgListMixin
+  } from '@/mixins/JeecgListMixin'
+  import moment from 'dayjs'
+  import {
+    httpAction,
+    getAction,
+    postAction,
+    putAction,
+    deleteAction,
+    downFile
+  } from '@/api/manage'
+  import productionTotalOrderAdd from './modules/productionTotalOrderAdd'
+  import productionTotalOrderDetail from './modules/productionTotalOrderDetail'
+  import {
+    queryDepartTreeList
+  } from '@/api/api'
+  import alertModal from '../../../plugins/modal'
+  import {
+    Message
+  } from "element-ui";
+  //---------workflow  by fhf end -------------
+  export default {
+    name: "materialProcurementList",
+    mixins: [JeecgListMixin],
+    components: {
+      productionTotalOrderAdd,
+      productionTotalOrderDetail
+    },
+    data() {
+      return {
+        description: '生产总订单页面',
+        queryParam: {},
+        selectedRowKeys: [],
+        selectedRows: [],
+        disableMixinCreated: '1',
+        documentData: [],
+        orderDate: [],
+        toggleSearchStatus: false,
+        dataSource: [],
+        ipagination: {
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + '-' + range[1] + ' 共' + total + '条'
           },
-          data () {
-            return {
-              description: '资产调拨主表管理页面',
-              queryParam:{},
-              selectedRowKeys:[],
-              selectedRows:[],
-              disableMixinCreated:'1',
-              documentData:[],
-              orderDate:[],
-              toggleSearchStatus:false,
-              dataSource:[ ],
-              ipagination:{
-                current: 1,
-                pageSize: 10,
-                pageSizeOptions: ['10', '20', '30'],
-                showTotal: (total, range) => {
-                    return range[0] + '-' + range[1] + ' 共' + total + '条'
-                },
-                showQuickJumper: true,
-                showSizeChanger: true,
-                total: 0
-              },
-              // 表头
-              columns: [
-                {
-                  title: '行号',
-                  dataIndex: '',
-                  key: 'rowIndex',
-                  width: 60,
-                  align: "center",
-                  customRender:function (t, r, index) {
-                    return parseInt(index)+1;
-                  }
-                },
-                {
-                  title: '生产组织',
-                  align:"center",
-                  dataIndex: 'orgName',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '单据号',
-                  align:"center",
-                  dataIndex: 'orderCode',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '单据日期',
-                  align:"center",
-                  dataIndex: 'orderDate',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '单据状态',
-                  align:"center",
-                  dataIndex: 'state',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '业务员',
-                  align:"center",
-                  dataIndex: 'salesperson',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '计划部门',
-                  align:"center",
-                  dataIndex: 'planDept',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '项目',
-                  align:"center",
-                  dataIndex: 'projectName',
-                  ellipsis: true,
-    
-                }, 
-                {
-                  title: '项目编码',
-                  align:"center",
-                  dataIndex: 'projectCode',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '工单号',
-                  align:"center",
-                  dataIndex: 'workNo',
-                  ellipsis: true,
-                    
-                },
-                {
-                  title: '业务类型',
-                  align:"center",
-                  dataIndex: 'type',
-                  ellipsis: true,
-                    
-                },
-                {
-                  title: '备注',
-                  align:"center",
-                  dataIndex: 'remarks',
-                  ellipsis: true,
-    
-                },
-                
-                {
-                  title: '审核人',
-                  align:"center",
-                  dataIndex: 'reviewer',
-                  ellipsis: true,
-    
-                },
-                
-               {
-                 title: '制单人',
-                 align:"center",
-                 dataIndex: 'createBy',
-                 ellipsis: true,
-                   
-               },
-                // {
-                //   title: '来源标识',
-                //   align:"center",
-                //   dataIndex: 'sourceInfo',
-                //   ellipsis: true,
-                // },
-                // {
-                //   title: '改单版本',
-                //   align:"center",
-                //   dataIndex: 'version',
-                //   ellipsis: true,
-                // },
-                {
-                  title: '制单时间',
-                  align:"center",
-                  dataIndex: 'createTime',
-                  ellipsis: true,
-                },
-              ],
-              fileUpload: window._CONFIG['domianURL'] + "/productionOrder/madeProductionOrders/importExcel",
-                 // ---------workflow  by fhf start -------------
-              serviceName: 'assetAllocationService',
-              // ---------workflow  by fhf end -------------
-              }
-            },
-          computed: {},
-      
-          created () {
-            this.getTableList()
-           },
-          methods: {
-            //获取数据
-            getTableList(){
-              alertModal.loading("执行中,请稍后!")
-              this.selectedRowKeys = []
-              this.selectedRows = []
-              getAction('/productionOrder/madeProductionOrders/list',this.queryParam).then(res=>{
-                        alertModal.closeLoading();
-                        if(res.success){
-                           this.dataSource =res.result.records
-                           this.selectedRowKeys = []
-                           this.selectedRows = []
-                           this.ipagination = {
-                                total: res.result.total,
-                                current: res.result.current,
-                                pageSize: res.result.size
-                            }
-                        }else{
-                          this.$message.error(res.message);
-                        }
-                    })
-            },
-            //查询
-            searchQuery(){
-              this.selectedRow=[]
-              this.selectedRowKeys = []
-              this.queryParam.pageNo=1
-              this.getTableList()
-            },
-            handleUploadChange({ file, fileList }){
-                if (file.status === 'done'&&file.response.success) {
-                    this.$message.success(file.response.message)
-                    this.getTableList()
-                }else if(file.status === 'done'&&!file.response.success){
-                    this.$message.error(file.response.message)
-                }
-            },
-            //单据日期
-            changeStartDate(data){
-              this.orderDate = data
-              this.queryParam.orderDate_begin = data.length==2?moment(data[0]).format('YYYY-MM-DD'):''
-              this.queryParam.orderDate_end = data.length==2?moment(data[1]).format('YYYY-MM-DD'):''
-            },
-            onSearch(){
-            },
-            //重置
-            searchReset(){
-                this.queryParam={}
-                this.orderDate = []
-                this.getTableList()
-            },
-            //新增
-            addList(){
-                this.$refs.productionTotalOrderAdd.visible=true
-                this.$refs.productionTotalOrderAdd.defaultMethod='add'
-                this.$refs.productionTotalOrderAdd.form.state='开立'
-                this.$refs.productionTotalOrderAdd.title = '新增'
-            },
-            editList(){
-              if(this.selectedRowKeys.length==0){
-                this.$message.warning('请选择数据!')
-              }else if(this.selectedRowKeys.length>1){
-                this.$message.warning('请选择一条数据!')
-              }else if(this.selectedRows[0].state!=='开立'){
-                this.$message.warning('此状态数据不可修改!')
-              }else{
-                this.$refs.productionTotalOrderAdd.visible=true
-                this.$refs.productionTotalOrderAdd.defaultMethod='edit'
-                this.$refs.productionTotalOrderAdd.getMainData(this.selectedRowKeys[0])
-                this.$refs.productionTotalOrderAdd.title = '编辑'
-              }
-            },
-            actionList(){
-              if(this.selectedRowKeys.length!==1){
-                this.$message.warning('请勾选一条数据!')
-              }else if(this.selectedRows[0].state=='开立'||this.selectedRows[0].state=='关闭'){
-                this.$message.warning('该状态订单不可操作')
-              }else{
-                this.$refs.productionTotalOrderAdd.visible=true
-                this.$refs.productionTotalOrderAdd.defaultMethod='edit'
-                this.$refs.productionTotalOrderAdd.getMainData(this.selectedRowKeys[0])
-                this.$refs.productionTotalOrderAdd.title = '订单操作'
-              }
-            },
-            detailList(){
-              if(this.selectedRowKeys.length==0){
-                this.$message.warning('请选择数据!')
-              }else if(this.selectedRowKeys.length>1){
-                this.$message.warning('请选择一条数据!')
-              }else{
-                this.$refs.productionTotalOrderDetail.visible=true
-                this.$refs.productionTotalOrderDetail.getMainData(this.selectedRowKeys[0])
-              }
-            },
-            //弃审
-            abstainExamineApprove(){
-              if(this.selectedRowKeys.length==0){
-                this.$message.warning('请选择数据!')
-              }else{
-                this.$confirm({
-                  title: '确认弃审',
-                  content: '是否弃审选中数据?',
-                  onOk:  ()=> {
-                    var ids =  this.selectedRowKeys.toString()
-                    alertModal.loading("执行中,请稍后!")
-                    getAction('/productionOrder/madeProductionOrders/unReviewerByIds',{ids:ids}).then(res=>{
-                      alertModal.closeLoading();
-                      if(res.success){
-                        this.getTableList()
-                        
-                        var arr = res.message.split(";");
-                        var str = arr.join(' <br/> ');
-                        Message({
-                          dangerouslyUseHTMLString: true,
-                          message: str,
-                          type: ''
-                        });
-                        // this.$message.success(res.message)
-                      }else{
-                        this.$message.error(res.message)
-                      }
-                    })
-                  }
-                })
-              }
-            },
-            //整单关闭
-            entireClose(){
-              if(this.selectedRowKeys.length==0){
-                this.$message.warning('请选择要关闭的数据!')
-              }else{
-                this.$confirm({
-                  title: '是否确认关闭?',
-                  content: '注:关闭后此单据将无法进行任何操作',
-                  onOk:  ()=> {
-                    var ids =  this.selectedRowKeys.toString()
-                    alertModal.loading("执行中,请稍后!")
-                    getAction('/productionOrder/madeProductionOrders/unReviewerByIds',{ids:ids}).then(res=>{
-                      alertModal.closeLoading();
-                      if(res.success){
-                        this.getTableList()
-                        this.$message.success(res.message)
-                      }else{
-                        this.$message.error(res.message)
-                      }
-                    })
-                  }
-                })
-              }
-            },
-            //删除
-            delecteList(){
-              if(this.selectedRowKeys.length==0){
-                this.$message.warning('请勾选数据!')
-              }else if(this.selectedRowKeys.length==1){
-                this.$confirm({
-                  title: '确认删除',
-                  content: '是否删除选中数据?',
-                  onOk:  ()=>{
-                      alertModal.loading("执行中,请稍后!")
-                      deleteAction('/productionOrder/madeProductionOrders/delete', {id: this.selectedRowKeys[0]}).then((res) => {
-                          alertModal.closeLoading();
-                          if (res.success) {
-                            this.selectedRowKeys =[]
-                            this.selectedRows =[]
-                            this.$message.success('删除成功!');
-                            this.getTableList()
-                          } else {
-                            this.$message.error(res.message);
-                          }
-                      });
-                  }
-                })
-              }else{
-                this.$confirm({
-                  title: '确认删除',
-                  content: '是否删除选中数据?',
-                  onOk:  ()=> {
-                    var ids =  this.selectedRowKeys.toString()
-                    alertModal.loading("执行中,请稍后!")
-                    deleteAction('/productionOrder/madeProductionOrders/deleteBatch', {ids: ids}).then((res) => {
-                        alertModal.closeLoading();
-                        if (res.success) {
-                            this.selectedRowKeys =[]
-                            this.selectedRows =[]
-                            this.$message.success('删除成功!');
-                            this.getTableList()
-                        } else {
-                          this.$message.error(res.message);
-                        }
-                    });
-                  }
-                })
-              }
-            },
-            //导出
-            exportList(fileName){
-              this.$confirm({
-                  title: '确认导出',
-                  content: '是否导出数据?',
-                  onOk:  ()=> {
-                    alertModal.loading("执行中,请稍后!")
-                    let param = this.queryParam;
-                    param['selections'] = ''
-                    if(this.selectedRowKeys && this.selectedRowKeys.length>0){
-                      param['selections'] = this.selectedRowKeys.join(",")
-                    }
-                    downFile('/productionOrder/madeProductionOrders/exportXls', param).then(data => {
-                      alertModal.closeLoading();
-                      if (!data) {
-                        this.$message.warning('文件下载失败')
-                        return
-                      }
-                      if (typeof window.navigator.msSaveBlob !== 'undefined') {
-                        window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx')
-                      } else {
-                        let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
-                        let link = document.createElement('a')
-                        link.style.display = 'none'
-                        link.href = url
-                        link.setAttribute('download', fileName + '.xlsx')
-                        document.body.appendChild(link)
-                        link.click()
-                        document.body.removeChild(link) // 下载完成移除元素
-                        window.URL.revokeObjectURL(url) // 释放掉blob对象
-                      }
-                    })
-                  }
-                })
-            },
-            examineApprove(){
-              if(this.selectedRowKeys.length==0){
-                this.$message.warning('请选择数据!')
-              }else{
-                this.$confirm({
-                  title: '确认审批',
-                  content: '是否审批选中数据?',
-                  onOk:  ()=> {
-                    var ids =  this.selectedRowKeys.toString()
-                    alertModal.loading("执行中,请稍后!")
-                    getAction('productionOrder/madeProductionOrders/reviewerByIds',{ids:ids}).then(res=>{
-                        alertModal.closeLoading();
-                        if(res.success){
-                          this.getTableList()
-                          var arr = res.message.split(";");
-                          var str = arr.join(' <br/> ');
-                          Message({
-                            dangerouslyUseHTMLString: true,
-                            message: str,
-                            type: ''
-                          });
-                          // this.$message.success(res.message)
-                         }else{
-                          this.$message.error(res.message)
-                         }
-                    })
-                  }
-               })
-              }
-            },
-            //勾选
-            onSelectChange(selectedRowKeys, selectionRows) {
-              this.selectedRowKeys = selectedRowKeys;
-              this.selectedRows = selectionRows;
-            },
-            handleTableChange(pagination, filters, sorter) {
-                this.queryParam.pageNo = pagination.current
-                this.queryParam.pageSize = pagination.pageSize
-                this.getTableList()
-            },
-            //双击
-            clickRow(record, index){
-              return {
-                on: {
-                  dblclick: () => {
-                    this.$refs.productionTotalOrderDetail.visible=true
-                    this.$refs.productionTotalOrderDetail.getMainData(record.id)
-                  },
-                }
-              }       
-           },
-        }
-    }
-      </script>
-      <style scoped lang="less">
-        /* @import '~@assets/less/common.less' */
-        /deep/.ant-input{
-            height:29px;
-        }
-        /deep/.ant-select-selection--single {
-            height: 29px;
-            
-        }
-        /deep/.ant-select{
-            font-size: 12px;
-        }
-        /deep/.ant-form label{
-            font-size: 12px;
-        }
-        /deep/.table-page-search-wrapper .ant-form-inline .ant-form-item{
-            margin-bottom:9px
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        // 表头
+        columns: [{
+            title: '行号',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: "center",
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1;
+            }
+          },
+          {
+            title: '生产组织',
+            align: "center",
+            dataIndex: 'orgName',
+            ellipsis: true,
+
+          },
+          {
+            title: '单据号',
+            align: "center",
+            dataIndex: 'orderCode',
+            ellipsis: true,
+
+          },
+          {
+            title: '单据日期',
+            align: "center",
+            dataIndex: 'orderDate',
+            ellipsis: true,
+
+          },
+          {
+            title: '单据状态',
+            align: "center",
+            dataIndex: 'state',
+            ellipsis: true,
+
+          },
+          {
+            title: '业务员',
+            align: "center",
+            dataIndex: 'salesperson',
+            ellipsis: true,
+
+          },
+          {
+            title: '计划部门',
+            align: "center",
+            dataIndex: 'planDept',
+            ellipsis: true,
+
+          },
+          {
+            title: '项目',
+            align: "center",
+            dataIndex: 'projectName',
+            ellipsis: true,
+
+          },
+          {
+            title: '项目编码',
+            align: "center",
+            dataIndex: 'projectCode',
+            ellipsis: true,
+
+          },
+          {
+            title: '工单号',
+            align: "center",
+            dataIndex: 'workNo',
+            ellipsis: true,
+
+          },
+          {
+            title: '业务类型',
+            align: "center",
+            dataIndex: 'type',
+            ellipsis: true,
+
+          },
+          {
+            title: '备注',
+            align: "center",
+            dataIndex: 'remarks',
+            ellipsis: true,
+
+          },
+
+          {
+            title: '审核人',
+            align: "center",
+            dataIndex: 'reviewer',
+            ellipsis: true,
+
+          },
+
+          {
+            title: '制单人',
+            align: "center",
+            dataIndex: 'createBy',
+            ellipsis: true,
+
+          },
+          // {
+          //   title: '来源标识',
+          //   align:"center",
+          //   dataIndex: 'sourceInfo',
+          //   ellipsis: true,
+          // },
+          // {
+          //   title: '改单版本',
+          //   align:"center",
+          //   dataIndex: 'version',
+          //   ellipsis: true,
+          // },
+          {
+            title: '制单时间',
+            align: "center",
+            dataIndex: 'createTime',
+            ellipsis: true,
+          },
+        ],
+        fileUpload: window._CONFIG['domianURL'] + "/productionOrder/madeProductionOrders/importExcel",
+        // ---------workflow  by fhf start -------------
+        serviceName: 'assetAllocationService',
+        // ---------workflow  by fhf end -------------
+      }
+    },
+    computed: {},
+
+    created() {
+      this.getTableList()
+    },
+    methods: {
+      isDisabledAuth(code) {
+        return disabledAuthFilter(code, this.formData);
+      },
+      //获取数据
+      getTableList() {
+        alertModal.loading("执行中,请稍后!")
+        this.selectedRowKeys = []
+        this.selectedRows = []
+        getAction('/productionOrder/madeProductionOrders/list', this.queryParam).then(res => {
+          alertModal.closeLoading();
+          if (res.success) {
+            this.dataSource = res.result.records
+            this.selectedRowKeys = []
+            this.selectedRows = []
+            this.ipagination = {
+              total: res.result.total,
+              current: res.result.current,
+              pageSize: res.result.size
+            }
+          } else {
+            this.$message.error(res.message);
+          }
+        })
+      },
+      //查询
+      searchQuery() {
+        this.selectedRow = []
+        this.selectedRowKeys = []
+        this.queryParam.pageNo = 1
+        this.getTableList()
+      },
+      handleUploadChange({
+        file,
+        fileList
+      }) {
+        if (file.status === 'done' && file.response.success) {
+          this.$message.success(file.response.message)
+          this.getTableList()
+        } else if (file.status === 'done' && !file.response.success) {
+          this.$message.error(file.response.message)
         }
-        /deep/.top>.ant-card-body{
-            padding-bottom:0px;
-            padding-top: 12px;
+      },
+      //单据日期
+      changeStartDate(data) {
+        this.orderDate = data
+        this.queryParam.orderDate_begin = data.length == 2 ? moment(data[0]).format('YYYY-MM-DD') : ''
+        this.queryParam.orderDate_end = data.length == 2 ? moment(data[1]).format('YYYY-MM-DD') : ''
+      },
+      onSearch() {},
+      //重置
+      searchReset() {
+        this.queryParam = {}
+        this.orderDate = []
+        this.getTableList()
+      },
+      //新增
+      addList() {
+        this.$refs.productionTotalOrderAdd.visible = true
+        this.$refs.productionTotalOrderAdd.defaultMethod = 'add'
+        this.$refs.productionTotalOrderAdd.form.state = '开立'
+        this.$refs.productionTotalOrderAdd.title = '新增'
+      },
+      editList() {
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning('请选择数据!')
+        } else if (this.selectedRowKeys.length > 1) {
+          this.$message.warning('请选择一条数据!')
+        } else if (this.selectedRows[0].state !== '开立') {
+          this.$message.warning('此状态数据不可修改!')
+        } else {
+          this.$refs.productionTotalOrderAdd.visible = true
+          this.$refs.productionTotalOrderAdd.defaultMethod = 'edit'
+          this.$refs.productionTotalOrderAdd.getMainData(this.selectedRowKeys[0])
+          this.$refs.productionTotalOrderAdd.title = '编辑'
         }
-        /deep/.ant-btn{
-            height:28px
+      },
+      actionList() {
+        if (this.selectedRowKeys.length !== 1) {
+          this.$message.warning('请勾选一条数据!')
+        } else if (this.selectedRows[0].state == '开立' || this.selectedRows[0].state == '关闭') {
+          this.$message.warning('该状态订单不可操作')
+        } else {
+          this.$refs.productionTotalOrderAdd.visible = true
+          this.$refs.productionTotalOrderAdd.defaultMethod = 'edit'
+          this.$refs.productionTotalOrderAdd.getMainData(this.selectedRowKeys[0])
+          this.$refs.productionTotalOrderAdd.title = '订单操作'
         }
-        /deep/.ant-table-thead > tr > th{
-            padding: 6px 8px !important;
+      },
+      detailList() {
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning('请选择数据!')
+        } else if (this.selectedRowKeys.length > 1) {
+          this.$message.warning('请选择一条数据!')
+        } else {
+          this.$refs.productionTotalOrderDetail.visible = true
+          this.$refs.productionTotalOrderDetail.getMainData(this.selectedRowKeys[0])
         }
-        /deep/ .ant-table-tbody > tr > td{
-            padding: 6px 8px !important;
+      },
+      //弃审
+      abstainExamineApprove() {
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning('请选择数据!')
+        } else {
+          this.$confirm({
+            title: '确认弃审',
+            content: '是否弃审选中数据?',
+            onOk: () => {
+              var ids = this.selectedRowKeys.toString()
+              alertModal.loading("执行中,请稍后!")
+              getAction('/productionOrder/madeProductionOrders/unReviewerByIds', {
+                ids: ids
+              }).then(res => {
+                alertModal.closeLoading();
+                if (res.success) {
+                  this.getTableList()
+
+                  var arr = res.message.split(";");
+                  var str = arr.join(' <br/> ');
+                  Message({
+                    dangerouslyUseHTMLString: true,
+                    message: str,
+                    type: ''
+                  });
+                  // this.$message.success(res.message)
+                } else {
+                  this.$message.error(res.message)
+                }
+              })
+            }
+          })
         }
-        /deep/ .ant-table{
-            font-size:12px
+      },
+      //整单关闭
+      entireClose() {
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning('请选择要关闭的数据!')
+        } else {
+          this.$confirm({
+            title: '是否确认关闭?',
+            content: '注:关闭后此单据将无法进行任何操作',
+            onOk: () => {
+              var ids = this.selectedRowKeys.toString()
+              alertModal.loading("执行中,请稍后!")
+              getAction('/productionOrder/madeProductionOrders/unReviewerByIds', {
+                ids: ids
+              }).then(res => {
+                alertModal.closeLoading();
+                if (res.success) {
+                  this.getTableList()
+                  this.$message.success(res.message)
+                } else {
+                  this.$message.error(res.message)
+                }
+              })
+            }
+          })
         }
-        /deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
-            width: calc(100% + 9px);//减去滚动条的宽度
+      },
+      //删除
+      delecteList() {
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning('请勾选数据!')
+        } else if (this.selectedRowKeys.length == 1) {
+          this.$confirm({
+            title: '确认删除',
+            content: '是否删除选中数据?',
+            onOk: () => {
+              alertModal.loading("执行中,请稍后!")
+              deleteAction('/productionOrder/madeProductionOrders/delete', {
+                id: this.selectedRowKeys[0]
+              }).then((res) => {
+                alertModal.closeLoading();
+                if (res.success) {
+                  this.selectedRowKeys = []
+                  this.selectedRows = []
+                  this.$message.success('删除成功!');
+                  this.getTableList()
+                } else {
+                  this.$message.error(res.message);
+                }
+              });
+            }
+          })
+        } else {
+          this.$confirm({
+            title: '确认删除',
+            content: '是否删除选中数据?',
+            onOk: () => {
+              var ids = this.selectedRowKeys.toString()
+              alertModal.loading("执行中,请稍后!")
+              deleteAction('/productionOrder/madeProductionOrders/deleteBatch', {
+                ids: ids
+              }).then((res) => {
+                alertModal.closeLoading();
+                if (res.success) {
+                  this.selectedRowKeys = []
+                  this.selectedRows = []
+                  this.$message.success('删除成功!');
+                  this.getTableList()
+                } else {
+                  this.$message.error(res.message);
+                }
+              });
+            }
+          })
         }
-        /deep/.middle>.ant-card-body{
-            padding-bottom:2px;
-            padding-top:14px;
+      },
+      //导出
+      exportList(fileName) {
+        this.$confirm({
+          title: '确认导出',
+          content: '是否导出数据?',
+          onOk: () => {
+            alertModal.loading("执行中,请稍后!")
+            let param = this.queryParam;
+            param['selections'] = ''
+            if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+              param['selections'] = this.selectedRowKeys.join(",")
+            }
+            downFile('/productionOrder/madeProductionOrders/exportXls', param).then(data => {
+              alertModal.closeLoading();
+              if (!data) {
+                this.$message.warning('文件下载失败')
+                return
+              }
+              if (typeof window.navigator.msSaveBlob !== 'undefined') {
+                window.navigator.msSaveBlob(new Blob([data], {
+                  type: 'application/vnd.ms-excel'
+                }), fileName + '.xlsx')
+              } else {
+                let url = window.URL.createObjectURL(new Blob([data], {
+                  type: 'application/vnd.ms-excel'
+                }))
+                let link = document.createElement('a')
+                link.style.display = 'none'
+                link.href = url
+                link.setAttribute('download', fileName + '.xlsx')
+                document.body.appendChild(link)
+                link.click()
+                document.body.removeChild(link) // 下载完成移除元素
+                window.URL.revokeObjectURL(url) // 释放掉blob对象
+              }
+            })
+          }
+        })
+      },
+      //导出
+      exportXlsModelSCZDD(fileName) {
+        this.$confirm({
+          title: '确认导出',
+          content: '是否导出模板?',
+          onOk: () => {
+            alertModal.loading("执行中,请稍后!")
+            let param = this.queryParam;
+            param['selections'] = ''
+            if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+              param['selections'] = this.selectedRowKeys.join(",")
+            }
+            downFile('/materialRequisition/madeMaterialRequisition/exportXlsModelSCZDD', param).then(data => {
+              alertModal.closeLoading();
+              if (!data) {
+                this.$message.warning('文件下载失败')
+                return
+              }
+              if (typeof window.navigator.msSaveBlob !== 'undefined') {
+                window.navigator.msSaveBlob(new Blob([data], {
+                  type: 'application/vnd.ms-excel'
+                }), fileName + '.xlsx')
+              } else {
+                let url = window.URL.createObjectURL(new Blob([data], {
+                  type: 'application/vnd.ms-excel'
+                }))
+                let link = document.createElement('a')
+                link.style.display = 'none'
+                link.href = url
+                link.setAttribute('download', fileName + '.xlsx')
+                document.body.appendChild(link)
+                link.click()
+                document.body.removeChild(link) // 下载完成移除元素
+                window.URL.revokeObjectURL(url) // 释放掉blob对象
+              }
+            })
+          }
+        })
+      },
+      examineApprove() {
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning('请选择数据!')
+        } else {
+          this.$confirm({
+            title: '确认审批',
+            content: '是否审批选中数据?',
+            onOk: () => {
+              var ids = this.selectedRowKeys.toString()
+              alertModal.loading("执行中,请稍后!")
+              getAction('productionOrder/madeProductionOrders/reviewerByIds', {
+                ids: ids
+              }).then(res => {
+                alertModal.closeLoading();
+                if (res.success) {
+                  this.getTableList()
+                  var arr = res.message.split(";");
+                  var str = arr.join(' <br/> ');
+                  Message({
+                    dangerouslyUseHTMLString: true,
+                    message: str,
+                    type: ''
+                  });
+                  // this.$message.success(res.message)
+                } else {
+                  this.$message.error(res.message)
+                }
+              })
+            }
+          })
         }
-        /deep/.ant-select-sm .ant-select-selection__rendered{
-            line-height: 27px;
+      },
+      //勾选
+      onSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectedRows = selectionRows;
+      },
+      handleTableChange(pagination, filters, sorter) {
+        this.queryParam.pageNo = pagination.current
+        this.queryParam.pageSize = pagination.pageSize
+        this.getTableList()
+      },
+      //双击
+      clickRow(record, index) {
+        return {
+          on: {
+            dblclick: () => {
+              this.$refs.productionTotalOrderDetail.visible = true
+              this.$refs.productionTotalOrderDetail.getMainData(record.id)
+            },
+          }
         }
-      </style>
+      },
+    }
+  }
+</script>
+<style scoped lang="less">
+  /* @import '~@assets/less/common.less' */
+  /deep/.ant-input {
+    height: 29px;
+  }
+
+  /deep/.ant-select-selection--single {
+    height: 29px;
+
+  }
+
+  /deep/.ant-select {
+    font-size: 12px;
+  }
+
+  /deep/.ant-form label {
+    font-size: 12px;
+  }
+
+  /deep/.table-page-search-wrapper .ant-form-inline .ant-form-item {
+    margin-bottom: 9px
+  }
+
+  /deep/.top>.ant-card-body {
+    padding-bottom: 0px;
+    padding-top: 12px;
+  }
+
+  /deep/.ant-btn {
+    height: 28px
+  }
+
+  /deep/.ant-table-thead>tr>th {
+    padding: 6px 8px !important;
+  }
+
+  /deep/ .ant-table-tbody>tr>td {
+    padding: 6px 8px !important;
+  }
+
+  /deep/ .ant-table {
+    font-size: 12px
+  }
+
+  /deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header {
+    width: calc(100% + 9px); //减去滚动条的宽度
+  }
+
+  /deep/.middle>.ant-card-body {
+    padding-bottom: 2px;
+    padding-top: 14px;
+  }
+
+  /deep/.ant-select-sm .ant-select-selection__rendered {
+    line-height: 27px;
+  }
+</style>

+ 36 - 0
src/views/production/safetyStock/encoderList.vue

@@ -75,6 +75,7 @@
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" @change="handleUploadChange"  :action="fileUpload">
                <a-button  size="small">导入</a-button>
             </a-upload>
+            <a-button size="small" @click="exportXlsModelBMQ('编码器模板')">下载导入模板</a-button>
             <a-button size="small" @click="exportList('编码器列表')">导出</a-button>
             <a-button size="small" @click="syncList">同步至u9</a-button>
           </div>
@@ -296,6 +297,41 @@
                   }
                 })
             },
+            //导出
+            exportXlsModelBMQ(fileName){
+              this.$confirm({
+                  title: '确认导出',
+                  content: '是否导出模板?',
+                  onOk:  ()=> {
+                    alertModal.loading("执行中,请稍后!")
+                    let param = this.queryParam;
+                    param['selections'] = ''
+                    if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+                      param['selections'] = this.selectedRowKeys.join(",")
+                    }
+                    downFile('/materialRequisition/madeMaterialRequisition/exportXlsModelBMQ', param).then(data => {
+                      alertModal.closeLoading();
+                      if (!data) {
+                        this.$message.warning('文件下载失败')
+                        return
+                      }
+                      if (typeof window.navigator.msSaveBlob !== 'undefined') {
+                        window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx')
+                      } else {
+                        let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+                        let link = document.createElement('a')
+                        link.style.display = 'none'
+                        link.href = url
+                        link.setAttribute('download', fileName + '.xlsx')
+                        document.body.appendChild(link)
+                        link.click()
+                        document.body.removeChild(link) // 下载完成移除元素
+                        window.URL.revokeObjectURL(url) // 释放掉blob对象
+                      }
+                    })
+                  }
+                })
+            },
             //重置
             searchReset(){
                 this.queryParam={}

+ 5 - 0
src/views/production/safetyStock/modules/EncoderDetail.vue

@@ -29,6 +29,11 @@
                     <a-input placeholder="请输入" v-model="form.doubleUnit" disabled></a-input>
                   </a-form-model-item>
                 </a-col>
+                <a-col :md="8" :sm="24" >
+                  <a-form-model-item label="计量单位组" prop='uomName' >
+                    <a-input placeholder="请输入" v-model="form.uomName" disabled></a-input>
+                  </a-form-model-item>
+                </a-col>
                 <a-col :md="8" :sm="24" >
                   <a-form-model-item label="料品主单位" prop='unit' >
                     <a-input placeholder="请输入" v-model="form.unit" disabled></a-input>

+ 36 - 0
src/views/production/safetyStock/safetyStockList.vue

@@ -70,6 +70,7 @@
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" @change="handleUploadChange"  :action="importExcelUrl">
                <a-button  size="small">导入</a-button>
             </a-upload>
+            <a-button size="small" @click="exportXlsModelAQKC('安全库存模板')">下载导入模板</a-button>
             <a-button size="small" @click="exportList('安全库存列表')">导出</a-button>
           </div>
       
@@ -273,6 +274,41 @@
                   }
                 })
             },
+            //导出
+            exportXlsModelAQKC(fileName){
+              this.$confirm({
+                  title: '确认导出',
+                  content: '是否导出模板?',
+                  onOk:  ()=> {
+                    alertModal.loading("执行中,请稍后!")
+                    let param = this.queryParam;
+                    param['selections'] = ''
+                    if(this.selectedRowKeys && this.selectedRowKeys.length>0){
+                      param['selections'] = this.selectedRowKeys.join(",")
+                    }
+                    downFile('/materialRequisition/madeMaterialRequisition/exportXlsModelAQKC', param).then(data => {
+                      alertModal.closeLoading();
+                      if (!data) {
+                        this.$message.warning('文件下载失败')
+                        return
+                      }
+                      if (typeof window.navigator.msSaveBlob !== 'undefined') {
+                        window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx')
+                      } else {
+                        let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+                        let link = document.createElement('a')
+                        link.style.display = 'none'
+                        link.href = url
+                        link.setAttribute('download', fileName + '.xlsx')
+                        document.body.appendChild(link)
+                        link.click()
+                        document.body.removeChild(link) // 下载完成移除元素
+                        window.URL.revokeObjectURL(url) // 释放掉blob对象
+                      }
+                    })
+                  }
+                })
+            },
             //重置
             searchReset(){
                 this.queryParam={}