2025/7/4

8 months ago · 572f8656a0
6 changed files with 103 additions and 18 deletions
--- a/src/views/modules/part/locationInformation.vue
+++ b/src/views/modules/part/locationInformation.vue
@ -191,6 +191,20 @@ export default {
          fixed: '',
          columnWidth: 100
        },
+        {
+          userId: this.$store.state.user.name,
+          columnProp: 'showInQueryFlag',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '是否显示',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
      ],
    }
  },
--- a/src/views/modules/part/partFamilyInformation.vue
+++ b/src/views/modules/part/partFamilyInformation.vue
@ -94,6 +94,12 @@
            <el-option label="否" value="N"></el-option>
          </el-select>
        </el-form-item>
+        <el-form-item label="是否显示" prop="showInQueryFlag" :rules="rules.showInQueryFlag">
+          <el-select v-model="modalData.showInQueryFlag" style="width: 302px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
      </el-form>
      <el-footer style="height:30px;margin-top: 20px;text-align:center">
        <el-button type="primary" @click="saveData()">保存</el-button>
@ -154,6 +160,7 @@ export default {
        familyId: '',
        familyName: '',
        active: '',
+        showInQueryFlag: '',
        page: 1,
        limit: 10
      },
@ -165,7 +172,8 @@ export default {
        site: this.$store.state.user.site,
        familyId: '',
        familyName: '',
-        active: ''
+        active: '',
+        showInQueryFlag: ''
      },
      // ======== 数据列表 ========
      dataList: [],
@ -224,6 +232,20 @@ export default {
          fixed: '',
          columnWidth: 100
        },
+        {
+          userId: this.$store.state.user.name,
+          columnProp: 'showInQueryFlag',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '是否显示',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
        {
          userId: this.$store.state.user.name,
          functionId: 100004,
@ -319,6 +341,13 @@ export default {
            trigger: 'change'
          }
        ],
+        showInQueryFlag:[
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ],
      },
      // ======== 模态框开关控制 ========
      modalFlag: false,
@ -399,6 +428,7 @@ export default {
        familyId: '',
        familyName: '',
        active: 'Y',
+        showInQueryFlag: 'Y',
      }
      this.modalDisableFlag = false
      this.modalFlag = true
@ -415,6 +445,7 @@ export default {
        familyId: row.familyId,
        familyName: row.familyName,
        active: row.active,
+        showInQueryFlag: row.showInQueryFlag,
        updateBy: this.$store.state.user.name,
      }
      this.modalDisableFlag = true
--- a/src/views/modules/part/partGroupInformation.vue
+++ b/src/views/modules/part/partGroupInformation.vue
@ -94,6 +94,12 @@
            <el-option label="否" value="N"></el-option>
          </el-select>
        </el-form-item>
+        <el-form-item label="是否显示" prop="showInQueryFlag" :rules="rules.showInQueryFlag">
+          <el-select v-model="modalData.showInQueryFlag" style="width: 302px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
      </el-form>
      <el-footer style="height:30px;margin-top: 20px;text-align:center">
        <el-button type="primary" @click="saveData()">保存</el-button>
@ -146,6 +152,7 @@ export default {
        groupId: '',
        groupName: '',
        active: '',
+        showInQueryFlag: '',
        page: 1,
        limit: 10
      },
@ -157,6 +164,7 @@ export default {
        site: this.$store.state.user.site,
        groupId: '',
        groupName: '',
+        showInQueryFlag: '',
        active: ''
      },
      // ======== 数据列表 ========
@ -216,6 +224,20 @@ export default {
          fixed: '',
          columnWidth: 100
        },
+        {
+          userId: this.$store.state.user.name,
+          columnProp: 'showInQueryFlag',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '是否显示',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
        {
          userId: this.$store.state.user.name,
          functionId: 100005,
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@ -2015,7 +2015,11 @@
                  projectId: row.projectId,
                  searchType: 'Y',
                  username: this.$store.state.user.name,
-                  customerId: row.customerId
+                  customerId: row.customerId,
+                  limit: 10,
+                  limit2: 20,
+                  page: 1,
+                  page2: 1
                }
                getProjectInfoPartList(partParams).then(({data}) => {
                  if (data && data.code === 0) {
@ -2037,7 +2041,9 @@
                  site: row.site,
                  projectId: row.projectId,
                  createBy: this.$store.state.user.name,
-                  menuId: '102001'
+                  menuId: '102001',
+                  limit: 10,
+                  page: 1
                }
                quotationInformationSearch(quotationParams).then(({data}) => {
                  //区分请求成功和失败的状况
@ -2084,7 +2090,9 @@
                  site: row.site,
                  projectId: row.projectId,
                  createBy: this.$store.state.user.name,
-                  menuId: '103001'
+                  menuId: '103001',
+                  limit: 10,
+                  page: 1
                }
                proofingInformationSearch(proofingParams).then(({data}) => {
                  if (data && data.code === 0) {
@ -2108,7 +2116,9 @@
                  site: row.site,
                  projectId: row.projectId,
                  createBy: this.$store.state.user.name,
-                  menuId: '107001'
+                  menuId: '107001',
+                  limit: 10,
+                  page: 1
                }
                testInformationList(testParams).then(({data}) => {
                  if (data && data.code === 0) {
@ -2132,7 +2142,7 @@
                let toolParams = {
                  orderRef1: row.projectId,
                  site: row.site,
-                  username: this.$store.state.user.name
+                  username: this.$store.state.user.name,
                }
                searchProjectToolApplyDetail(toolParams).then(({data}) => {
                  if (data && data.code === 0) {
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue
@ -36,7 +36,7 @@
        </el-table-column>
        <el-table-column label="色序" header-align="center">
          <el-table-column
-            prop="order"
+            prop="showOrder"
            header-align="center"
            align="left"
            min-width="100"
@ -178,12 +178,13 @@
      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
        <el-form-item :label="'印刷面/Print Side'">
          <el-select v-model="colorData.printSide" style="width: 145px">
-            <el-option label="Front" value="front"></el-option>
-            <el-option label="Back" value="back"></el-option>
+            <el-option label="Front" value="Front"></el-option>
+            <el-option label="Back" value="Back"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item :label="'色序/Color sequence'">
-          <el-input v-model="colorData.order" :disabled="this.colorData.id!==0" type="number" style="width: 145px"  onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" ></el-input>
+<!--          <el-input v-model="colorData.showOrder" type="number" style="width: 145px"  onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" ></el-input>-->
+          <el-input v-model="colorData.showOrder" type="text" style="width: 145px" ></el-input>
        </el-form-item>
        <el-form-item :label="'颜色参考/Color Reference'">
          <el-input v-model="colorData.colorReference" style="width: 145px"></el-input>
@ -297,7 +298,8 @@
          updateBy:'',
          updateDate:'',
          resourceNo: '',
-          speed: ''
+          speed: '',
+          showOrder: null
        },
        colorFlag:false,
      }
@ -355,8 +357,8 @@
        }
        let number = 1
        for (let i = 0; i <this.colorTable.length ; i++) {
-          if (number <= this.colorTable[i].order) {
-            number = Number(this.colorTable[i].order) + 1
+          if (number <= this.colorTable[i].showOrder) {
+            number = Number(this.colorTable[i].showOrder) + 1
          }
        }
        this.colorData = {
@ -380,7 +382,8 @@
          updateBy: '',
          updateDate: '',
          resourceNo: '',
-          speed: ''
+          speed: '',
+          showOrder: null
        }
        this.colorFlag = true
      },
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@ -273,7 +273,7 @@
      <el-row :gutter="20">
        <el-col :span="6">
          <div class="grid-content bg-purple">
-            <el-button v-if="isAuth('103002:dataEntry')" type="primary" @click="handleDataEntry()">数据录入</el-button>
+            <el-button style="margin-top: 12px" v-if="isAuth('103002:dataEntry')" type="primary" @click="handleDataEntry()">数据录入</el-button>
          </div>
        </el-col>
      </el-row>
@ -403,7 +403,7 @@
      </el-footer>
    </el-dialog>

-    <el-dialog width="530px" title="数据录入" :close-on-click-modal="false" :visible.sync="dataEntryFlag" v-highlight-container>
+    <el-dialog width="950px" title="数据录入" :close-on-click-modal="false" :visible.sync="dataEntryFlag" v-highlight-container>
      <el-form label-position="top">
        <el-form-item label="备注区/Comments" class="auto-form">
            <el-input type="textarea" v-model="dataEntryForm.remarkPage" :rows="10" resize='none'></el-input>
@ -1405,8 +1405,13 @@
      },

      refresh1(){
-        this.dataEntryForm.remarkPage = this.dataForm.remarkPage
-        this.dataEntryForm.relevancePartNo = this.dataForm.relevancePartNo
+        this.$clearHighLight()
+        tsdBasicInformationSearch(this.searchData).then(({data}) => {
+          if (data&&data.code === 0){
+            this.dataEntryForm.remarkPage = data.row.remarkPage
+            this.dataEntryForm.relevancePartNo = data.row.relevancePartNo
+          }
+        })
      },

      submitDataEntry(){