2025/6/10

src/api/project/project.js

@@ -58,3 +58,7 @@ export const queryProjectCustomer = (data) => createAPI(`/project/customer`,'pos
 export const queryProjectFinalCustomer = (data) => createAPI(`/project/final/customer`,'post',data)
 
 export const queryUsernameByRoleSuperFlag = (data) => createAPI(`/project/site/user/role/super`,'post',data)
+
+export const projectInfoSearchByAnyField = data => createAPI(`/project/projectInfoSearch/any`,'Post',data)
+export const projectPartSearchByAnyField = data => createAPI(`/project/part/any`,'Post',data)
+

src/api/sampleManagement/technicalSpecificationList.js

@@ -144,5 +144,8 @@ export const bmStatusToFinish = data => createAPI("/technicalSpecification/bmSta
 
 export const getNodeList = data => createAPI("/technicalSpecification/node/list",'post',data)
 
+export const updateBMProcessInfo= data => createAPI(`/technicalSpecification/updateBMProcessInfo`,'post',data)
+
+
 
 

src/views/modules/project/projectInfo/projectInfo.vue

@@ -416,6 +416,7 @@
   import {isAuth} from "../../../../utils";
   import FilterSearch from "../../../common/filterSearch.vue";
   import {siteList} from "../../../../api/base/site";
+  import {projectInfoSearchByAnyField} from "../../../../api/project/project";
   /*組件*/
   export default {
     components: {
@@ -1997,9 +1998,12 @@
       },
 
       projectInfoSearchByAnyField(params){
-        mtdnm(params).then(({data})=>{
+        params.no = this.pageIndex
+        params.size = this.pageSize
+        projectInfoSearchByAnyField(params).then(({data})=>{
           if (data && data.code === 0){
-            this.dataList1 = data.data
+            this.dataList1 = data.page.list
+            this.totalPage = data.page.totalCount
           }else {
             this.$message.warning(data.msg)
           }

src/views/modules/project/projectPart/searchProjectPart.vue

@@ -39,6 +39,7 @@
           class="el-button el-button--primary el-button--medium">
           {{ '导出' }}
         </download-excel>
+        <el-button @click="filterVisible = true">搜索</el-button>
       </el-form-item>
     </el-form>
 
@@ -206,6 +207,7 @@
     </el-tabs>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <filter-search :visible.sync="filterVisible" @search="searchByAnyField"></filter-search>
   </div>
 </template>
 
@@ -231,8 +233,14 @@
   import CustomerInfo from "../../quotation/sellForQuotation/customerInfo.vue";
   import ChangeRecord from "../projectInfo/com_project_change_record.vue";
   import {isAuth} from "../../../../utils";
+  import FilterSearch from "../../../common/filterSearch.vue";
+  import {
+    technicalSpecificationListSearchByAnyField
+  } from "../../../../api/sampleManagement/technicalSpecificationList";
+  import {projectPartSearchByAnyField} from "../../../../api/project/project";
     export default {
       components: {
+        FilterSearch,
         ChangeRecord,
         CustomerInfo,
         toolApply,
@@ -256,6 +264,7 @@
           totalPage: 0,
           height: 200,
           dataListLoading: false,
+          filterVisible: false,
           // 导出 start
           exportData: [],
           exportName: "项目物料清单" + this.dayjs().format('YYYYMMDDHHmmss'),
@@ -1027,6 +1036,25 @@
 
         },
 
+        searchByAnyField(params){
+          params.site = this.$store.state.user.site
+          params.no = this.pageIndex
+          params.size = this.pageSize
+          projectPartSearchByAnyField(params).then(({data})=>{
+            if (data && data.code === 0){
+              this.dataList1 = data.page.list
+              this.totalPage = data.page.totalCount
+            }else {
+              this.$message.warning(data.msg)
+            }
+          }).catch((error)=>{
+            this.$message.error(error)
+          })
+          this.filterVisible = false
+        },
+
+
+
       }
     }
 </script>

src/views/modules/quotation/requestForQuote.vue

@@ -764,6 +764,8 @@
 
     <!-- 上传文件的modal -->
     <quotationUploadFile ref="quotationUploadFile" @refreshPageTables="getFileContentData()" v-drag></quotationUploadFile>
+
+    <filter-search :visible.sync="filterVisible" @search="searchByAnyField"></filter-search>
   </div>
 </template>
 
@@ -805,13 +807,14 @@ import PriceCheckDetail from "./sellForQuotation/priceCheckDetail/priceCheckDeta
 import {getPriceCheckDetailList} from "../../../api/quotation/priceCheckDetail";
 import InquiryQuoteDetail from "./inquiry/inquiryQuoteDetail.vue";
 import {queryCustomer} from "../../../api/customer/customerInformation";
-import {queryProjectByCustomer} from "../../../api/project/project";
+import {projectPartSearchByAnyField, queryProjectByCustomer} from "../../../api/project/project";
 import OssComponents from "../oss/ossComponents.vue";
 import BuSelect from "../base/BuSelect.vue";
 import ApprovalInformation from "../changeManagement/approvalInformation.vue";
 import {getApprovalList} from "../../../api/changeManagement/changeManagement";
 import CustomerInfo from "./sellForQuotation/customerInfo.vue";
 import {isAuth} from "../../../utils";
+import FilterSearch from "../../common/filterSearch.vue";
 
 export default {
   computed: {
@@ -832,6 +835,7 @@ export default {
     },
   },
   components: {
+    FilterSearch,
     CustomerInfo,
     ApprovalInformation,
     BuSelect,
@@ -983,6 +987,7 @@ export default {
       pageSize: 50,
       totalPage: 0,
       selectedDataNum: 0,
+      filterVisible: false,
       // 条件查询
       searchData: {
         site: this.$store.state.user.site,
@@ -3572,6 +3577,22 @@ export default {
       this.rejectVisible = false
       this.rejectOpinion = ''
     },
+    searchByAnyField(params){
+      params.site = this.$store.state.user.site
+      params.no = this.pageIndex
+      params.size = this.pageSize
+      projectPartSearchByAnyField(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.dataList1 = data.page.list
+          this.totalPage = data.page.totalCount
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+      this.filterVisible = false
+    },
   }
 }
 </script>

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

@@ -195,6 +195,61 @@
           <el-button type="primary" @click="jumpRoute()">跳转至Routing</el-button>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item  label="Simplex/Duplex">
+              <dict-data-select :site="searchData.site" v-if="searchData.site" clearable v-model="sheetData.simplexDuplex" :use-default-value="false" dict-type="bm_simplex_duplex" style="width: 120px"></dict-data-select>
+            </el-form-item>
+            <el-form-item  label="周长">
+              <dict-data-select :site="searchData.site" v-if="searchData.site" clearable v-model="sheetData.repeat" dict-type="bm_repeat" style="width: 120px"></dict-data-select>
+            </el-form-item>
+            <el-form-item  label="横向跳距">
+              <el-input v-model="sheetData.hp" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="横排数">
+              <el-input v-model="sheetData.across" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="印刷出纸方向">
+              <dict-data-select :site="searchData.site" v-if="searchData.site" clearable v-model="sheetData.printCopyPosition" dict-type="bm_print_copy_position" style="width: 120px"></dict-data-select>
+            </el-form-item>
+            <el-form-item  label="标签尺寸">
+              <el-input v-model="sheetData.labelSize" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="竖向跳距">
+              <el-input v-model="sheetData.vp" style="width: 120px" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item  label="竖排数">
+              <el-input v-model="sheetData.down" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="实际数目">
+              <el-input v-model="sheetData.actualNumber" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="成品卷边宽度">
+              <el-input v-model="sheetData.goodsRollWidth" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="是新刀具吗">
+              <el-input v-model="sheetData.newCutter" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="尺寸公差">
+              <el-input v-model="sheetData.dimensionTolerance" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="印刷刀模公差">
+              <el-input v-model="sheetData.p2cTolerance" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-form-item  label="修边公差(+/-)">
+              <el-input v-model="sheetData.slittingTolerance" style="width: 120px" ></el-input>
+            </el-form-item>
+            <el-button type="primary" @click="updateBMProcessInfo">修改</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
       <el-table
         :height="'250'"
         :data="tableData"
@@ -491,6 +546,7 @@
   import printFlexo from "./com_bm_printingFlexo";/*组件*/
   import printIndigo from "./com_bm_printingIndigo";
   import DictDataSelect from "../../sys/dict-data-select-highlight";
+  import {updateBMProcessInfo} from "../../../../api/sampleManagement/technicalSpecificationList";
   /*组件*/
   export default {
     components: {
@@ -540,7 +596,7 @@
           username: this.$store.state.user.name,
           codeNo: '',
           buNo:'',
-          fieldId:'',
+          fieldId:''
         },
         baseForm:{
           status:'',
@@ -558,6 +614,20 @@
           overPrintOperatorName:'',
           printOperator:'',
           printOperatorName:'',
+          simplexDuplex: '',
+          repeat: '',
+          hp: '',
+          across: null,
+          printCopyPosition: '',
+          labelSize: '',
+          vp: '',
+          down: null,
+          actualNumber: null,
+          goodsRollWidth: '',
+          newCutter: '',
+          dimensionTolerance: '',
+          p2cTolerance: '',
+          slittingTolerance: ''
         },
         dataForm:{
           site: '',
@@ -1468,6 +1538,24 @@
           }
         })
       },
+      updateBMProcessInfo(){
+        updateBMProcessInfo(this.sheetData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$clearHighLight()
+            tsdBasicInformationSearch(this.searchData).then(({data}) => {
+              if(data.row){
+                this.sheetData=data.row
+              }else {
+
+              }
+
+            });
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      },
       updateBMRouteRev(){
 
         if(this.currentRoute==null){

src/views/modules/sampleManagement/technicalSpecificationList.vue

@@ -1557,8 +1557,6 @@
       },
 
       queryByAnyField(params){
-        params.site = this.$store.state.user.site
-        params.username = this.$store.state.user.name
         params.no = this.pageIndex
         params.size = this.pageSize
         technicalSpecificationListSearchByAnyField(params).then(({data})=>{