【NEV-PC】暂存

fe/PC/src/components/StepsFormNotView/index.vue

@@ -10,7 +10,7 @@
     :modal-append-to-body="false"
     :show-close="false"
   >
-    <div id="stepsForm">
+    <div id="StepsFormNotView">
       <el-steps
         :active="active"
         process-status="finish"
@@ -114,9 +114,10 @@
               :key="item.label"
               :type="item.type"
               size="medium"
-              @click="successClick(item.click())"
+              @click="item.click()"
               >{{ item.label }}</el-button
             >
+              <!-- @click="successClick(item.click())" -->
             <el-button type="primary" size="medium" @click="close(1)"
               >退出</el-button
             >

fe/PC/src/components/StepsFormNotView/style/index.scss

@@ -1,4 +1,4 @@
-#stepsForm {
+#StepsFormNotView {
   width: 100%;
   height: 100%;
   display: flex;
@@ -38,6 +38,7 @@
     ::v-deep .el-form {
       flex: 1;
       display: flex;
+      justify-content: center;
       height: 100%;
       .el-row {
         display: none;

fe/PC/src/components/currenTable/index.vue

@@ -36,7 +36,7 @@
       </template>
       <template slot-scope="scope">
         <!-- 目的更新数据 -->
-        <div style="display:none">{{ TableSize }}</div>
+        <!-- <div style="display:none">{{ TableSize }}</div> -->
         <el-form>
         <el-form-item
           v-if="item.type == 'input'"
@@ -428,7 +428,6 @@ export default {
       };
     },
     TableSize(){
-      console.log('computed',this.tableColumnsFilter())
       this.$forceUpdate()
       return this.tableColumnsFilter()
     }

fe/PC/src/mixins/TableMixins.js

@@ -332,6 +332,7 @@ export const tableMixins = {
     },
     // 点击抽屉，获取明细后全局通用操作
     inlineDialogCallback(){
+      if(this.inlineDialogCallbackUser){this.inlineDialogCallbackUser()}
       // 如果业务页面设置showDetailBaseFromFE为空，detailsTableColumns.js别忘了删除配置项
       if(this.showDetailBaseFromFE && this.showDetailBaseFromFE.length > 0){
         this.getItemInfoByItemCodeHandle('detail')

fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob.vue

@@ -53,9 +53,12 @@
       :Options="editOptions"
       :detailsTableColumns="AddDetailsTableColumns"
       :childTableData="childTableData"
-      @close="stepsClose(arguments)"
+      @close="stepsCloseHandle(arguments)"
       @detailsDataPush="detailsDataPush"
       @detailsClear="detailsClear"
+      :isShowDeleteButton="false"
+      :addClickButton="false"
+      :successHandle="successHandle"
     ></StepsFormNotView>
   </div>
 </template>
@@ -66,6 +69,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
 export default {
   name: "customerDismantleJob",
   mixins: [
@@ -74,6 +78,7 @@ export default {
     drawerMixins,
     TableHeaderMixins,
     mixins,
+    filterSelectMixins,
   ],
   data () {
     return {
@@ -81,6 +86,7 @@ export default {
       detailURL: 'wms/store/product-recycle-note/note-and-back-flush',
       //常用按钮数据
       currenButtonData: [
+        this.defaultAddBtn(),//新增
         //导出
         this.defaultExportBtn({
           url:"wms/store/product-recycle-note/export-note-and-back-flush"
@@ -108,7 +114,17 @@ export default {
         details:[]
       },
       CreateForm: [
-        { type: "inputNumber", label: "数量", prop: "qty",colSpan: 12,min:1 },
+        { type: "inputNumber", label: "数量", prop: "qty",colSpan: 12,min:1,
+          validator: (rule, value, callback) => {
+            //todo：数量小于库存数
+            let _qty = Number(this.propsData.InventoryQty)
+            if(_qty < value){
+              return callback(new Error(`数量不能大于库存数量${_qty}`))
+            }else{
+              callback()
+            }
+          } 
+        },
       ],
       editRules: {
         cerateRule: {
@@ -117,11 +133,11 @@ export default {
       },
       AddDetailsTableColumns: [
         { label: "物料代码", prop: "partCode",width:"auto" },
-        { label: "数量", prop: 'qty',width:"auto" },//todo:可能需要计算
+        { label: "数量", prop: 'qty',width:"auto" },
         { type: "filterSelect", label: "库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "5"))},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) }, 
+          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) }, 
-          width:"auto", searchButton:false
+          width:"auto",
         },
       ],
       childTableData:[{
@@ -129,65 +145,93 @@ export default {
         qty:undefined,
         locationCode:undefined
       }],
+      successHandle:[
+        {
+          label:"下载",
+          click:(()=>{
+            this.downloadReport()
+          })
+        }
+      ]
     };
   },
   mounted () {
     this.paging();
   },
-  methods: {//渲染数据
+  methods: {
-    paging(callback) {
+    //过滤查询条件
-      this.Loading.tableLoading = true;
+    isFilter (val, data) {
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
+      let filter = [
-      getPageList(this.PageListParams, this.URL,true)
+        {
-        .then(res => {
+          logic: "And",
-          this.tableData = res.items
+          column: val,
-          this.totalCount = res.totalCount
+          action: "==",
-          this.tableData.forEach(item=>{
+          value: data
-            item.itemCode = item.noteAndBackFlushDetails[0].itemCode
+        }
-            item.locationCode = item.noteAndBackFlushDetails[0].locationCode
+      ]
-            item.qty = item.noteAndBackFlushDetails[0].qty
+      return filter
-            item.rawLocationCode = item.noteAndBackFlushDetails[0].rawLocationCode
+    },
-            item.preStartTime = item.noteAndBackFlushDetails[0].preStartTime
+    detailsDataPush(data){
-            item.workHour = item.noteAndBackFlushDetails[0].workHour
+      console.log(data)
-          })
+    },
-          this.pagingCallback(callback)
+    detailsClear(data){
-        })
+      console.log(data)
-        .catch(err => {
+    },
-          this.Loading.tableLoading = false
+    //导出存储-新
+    blob(res, fileName) {
+      let blob = new Blob([res], {
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
       })
+      const href = URL.createObjectURL(blob) //创建新的URL表示指定的blob对象
+      const a = document.createElement('a') //创建a标签
+      a.style.display = 'none'
+      a.href = href // 指定下载链接
+      a.download = fileName //指定下载文件名
+      a.click() //触发下载
+      URL.revokeObjectURL(a.href) //释放URL对象
     },
-    //点击Table行内名称
+    // 成功后按钮操作
-    inlineDialog(val) {
+    downloadReport(){
-      this.firstTabs = 'xq'
+      // 下载
-      //打开抽屉
+      // todo:下载获取接口
-      this.Loading.DrawerLoading = true
+      console.log(241)
-      this.displayDialog.detailsDialog = true;
+      // this.blob(res, menuName + '报告')
-      getDetailed(val.id, 'wms/store/product-recycle-note/note-and-back-flush')
+    },
-        .then(res => {
+    stepsSubmit (val) {
-          if (res.details) {
+      return new Promise((resolve, reject) => {
-            // 前端分页处理
+        resolve()
-            this.tableDataDetails = JSON.parse(JSON.stringify(res))
+        // todo:提交
-            let linshiTableDataDetails = JSON.parse(JSON.stringify(this.tableDataDetails))
+        //   postUpdate(this.CreateFormData, this.propsData.id, this.URL).then(res => {
-            this.totalCountDetails = res.details.length
+        //     this.propsData = res
-            // 删除除当前页面最大数以外数据
+        //     resolve();
-            linshiTableDataDetails.details.splice(this.MaxResultCountDetails,this.totalCountDetails); 
+        //   }).catch(err => {
-            this.propsData = linshiTableDataDetails
+        //     reject();
-          } else {
+        //   })
-            this.propsData = res
+      });
+    },
+    stepsCloseHandle(data){
+      // todo:关闭详情弹窗
+      this.displayDialog.detailsDialog = false
+      this.stepsClose(data)
+    },
+    PalletlFunction (val) {
+      return new Promise((resolve, reject) => {
+        if(val == 0){
+          console.log(this.CreateFormData.qty)
+          // todo:1、获取接口生成bom列表
+          this.CreateFormData.details = [{
+            partCode:"CS20231220001D",
+            qty:2,
+            locationCode:'WZSX'
+          }]
+          // todo:2、details的qty是否要乘以主表的qty值
+          resolve();
         }
-          if (this.propsData.noteAndBackFlushDetails.length > 0) {
+        // 提交
-            this.propsData.itemCode = this.propsData.noteAndBackFlushDetails[0].itemCode
+        if(val == 1){
-            this.propsData.locationCode = this.propsData.noteAndBackFlushDetails[0].locationCode
+          resolve()
-            this.propsData.qty = this.propsData.noteAndBackFlushDetails[0].qty
-            this.propsData.rawLocationCode = this.propsData.noteAndBackFlushDetails[0].rawLocationCode
-            this.propsData.preStartTime = this.propsData.noteAndBackFlushDetails[0].preStartTime
-            this.propsData.workHour = this.propsData.noteAndBackFlushDetails[0].workHour
         }
-          this.inlineDialogCallback()
+      });
-        })
-        .catch(err => {
-          this.Loading.DrawerLoading = false
-        })
     },
   }
 };

fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue

@@ -66,7 +66,7 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import { processRequest, getDetailed } from '@/api/wms-api'
 export default {
-  name: "PurchaseOrder",
+  name: "PurchaseOrderHigher",
   mixins: [
     tableMixins,
     LoadingMixins,