2024-04-09

src/views/modules/changeManagement/changeRequest.vue

@@ -117,7 +117,7 @@
                 </el-date-picker>
               </el-form-item>
               <el-form-item label="ECN变更影响" prop="changeImpact" :rules="rules.changeImpact">
-                <dict-data-select v-model="modalData.changeImpact" style="width: 205px" dict-type="change_change_Impact"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="modalData.changeImpact" style="width: 205px" dict-type="change_change_Impact"></dict-data-select>
               </el-form-item>
               <el-form-item label="变更影响描述" prop="changeImpactDesc" :rules="[{required: modalData.changeImpact === 'Y',message: ' ',trigger: ['blur','change']}]">
                 <el-input v-model="modalData.changeImpactDesc" style="width: 423px"></el-input>
@@ -125,13 +125,13 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item label="ECN阶段" prop="ecnStage" :rules="rules.ecnStage">
-                <dict-data-select v-model="modalData.ecnStage" style="width: 95px" dict-type="change_ecn_stage"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="modalData.ecnStage" style="width: 95px"  dict-type="change_ecn_stage"></dict-data-select>
               </el-form-item>
               <el-form-item label="变更类别" prop="changeType" :rules="rules.changeType">
-                <dict-data-select v-model="modalData.changeType" style="width: 95px" dict-type="change_change_type"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="modalData.changeType" style="width: 95px" dict-type="change_change_type"></dict-data-select>
               </el-form-item>
               <el-form-item label="ECN种类" prop="ecnType" :rules="rules.ecnType">
-                <dict-data-select v-model="modalData.ecnType" style="width: 100px" dict-type="change_ecn_type"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="modalData.ecnType" style="width: 100px" dict-type="change_ecn_type"></dict-data-select>
               </el-form-item>
               <el-form-item label=" ">
                 <el-button type="primary" @click="chooseEcnTypeModal" style="width: 90px">ECN种类</el-button>
@@ -157,7 +157,7 @@
 <!--                <dict-data-select v-model="modalData.printing" style="width: 205px" dict-type="change_printing"></dict-data-select>-->
 <!--              </el-form-item>-->
               <el-form-item label="是否DF产品" prop="dfIsProduct" :rules="rules.dfIsProduct">
-                <dict-data-select v-model="modalData.dfIsProduct" style="width: 205px" dict-type="change_df_is_product"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="modalData.dfIsProduct" style="width: 205px" dict-type="change_df_is_product"></dict-data-select>
               </el-form-item>
               <el-form-item label=" " prop="industrialEngineerId" :rules="[{required: modalData.dfIsProduct === 'Y',message: ' ',trigger: ['blur','change']}]">
                 <span style="cursor: pointer" slot="label" @click="getBaseList(103,6)"><a href="#">I/E</a></span>
@@ -177,7 +177,7 @@
 <!--                <el-button type="primary" icon="el-icon-upload" @click="uploadFileModal" style="margin-top: 12px;width: 105px">文件上传</el-button>-->
 <!--              </el-form-item>-->
               <el-form-item label="印刷方式" prop="printing" :rules="rules.printing">
-                <dict-data-select v-model="modalData.printing" style="width: 205px" dict-type="change_printing"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="modalData.printing" style="width: 205px" dict-type="change_printing"></dict-data-select>
                 <el-button type="primary" icon="el-icon-upload" @click="uploadFileModal" style="margin-top: 12px;width: 105px">文件上传</el-button>
               </el-form-item>
             </el-form>
@@ -280,7 +280,7 @@
                 <el-input class="inlineNumber numInput" v-model="costImpactData.productionProductNumber" :disabled="costImpactData.productionProductFlag !== 'Y'" type="number" style="width: 100px"></el-input>
               </el-form-item>
               <el-form-item label="处理意见">
-                <dict-data-select v-model="costImpactData.productionProductOpinions" :disabled="costImpactData.productionProductFlag !== 'Y'" style="width: 200px" dict-type="change_production_product_opinions"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="costImpactData.productionProductOpinions" :disabled="costImpactData.productionProductFlag !== 'Y'" style="width: 200px" dict-type="change_production_product_opinions"></dict-data-select>
               </el-form-item>
               <el-form-item label="报废金额">
                 <el-input class="inlineNumber numInput" v-model="costImpactData.productionProductScrapAmount" :disabled="costImpactData.productionProductFlag !== 'Y'" @input="handleInput(costImpactData.productionProductScrapAmount,1)" type="number" style="width: 140px"></el-input>
@@ -301,7 +301,7 @@
                 <el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductNumber" :disabled="costImpactData.inventoryProductFlag !== 'Y'" type="number" style="width: 100px"></el-input>
               </el-form-item>
               <el-form-item label="处理意见">
-                <dict-data-select v-model="costImpactData.inventoryProductOpinions" :disabled="costImpactData.inventoryProductFlag !== 'Y'" style="width: 200px" dict-type="change_inventory_product_opinions"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="costImpactData.inventoryProductOpinions" :disabled="costImpactData.inventoryProductFlag !== 'Y'" style="width: 200px" dict-type="change_inventory_product_opinions"></dict-data-select>
               </el-form-item>
               <el-form-item label="报废金额">
                 <el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductScrapAmount" :disabled="costImpactData.inventoryProductFlag !== 'Y'" @input="handleInput(costImpactData.inventoryProductScrapAmount,2)" type="number" style="width: 140px"></el-input>
@@ -330,7 +330,7 @@
                 <el-input class="inlineNumber numInput" v-model="costImpactData.affectedNumber" :disabled="costImpactData.affectedFlag !== 'Y'" type="number" style="width: 100px"></el-input>
               </el-form-item>
               <el-form-item label="处理意见">
-                <dict-data-select v-model="costImpactData.affectedOpinions" :disabled="costImpactData.affectedFlag !== 'Y'" style="width: 200px" dict-type="change_affected_opinions"></dict-data-select>
+                <dict-data-select v-if="modalFlag" v-model="costImpactData.affectedOpinions" :disabled="costImpactData.affectedFlag !== 'Y'" style="width: 200px" dict-type="change_affected_opinions"></dict-data-select>
               </el-form-item>
               <el-form-item label="报废金额">
                 <el-input class="inlineNumber numInput" v-model="costImpactData.affectedScrapAmount" :disabled="costImpactData.affectedFlag !== 'Y'" @input="handleInput(costImpactData.affectedScrapAmount,3)" type="number" style="width: 140px"></el-input>

src/views/modules/proofing/requestForProofing.vue

@@ -2310,14 +2310,6 @@
           this.$message.warning('请选择工程师名称！')
           return
         }
-        if (this.modalData.testPartNo === '' || this.modalData.testPartNo == null) {
-          this.$message.warning('请选择项目料号！')
-          return
-        }
-        if (this.modalData.partName === '' || this.modalData.partName == null) {
-          this.$message.warning('请选择物料名称！')
-          return
-        }
         if (!this.modalData.proofingNumber && this.modalData.proofingNumber > 0) {
           this.$message.warning('请输入正确的打样数量！')
           return

src/views/modules/quotation/requestForQuote.vue

@@ -192,13 +192,13 @@
               </el-row>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="4" v-if="false">
             <el-form-item>
               <span slot="label" @click="getCustomerContactList"><a>客户负责人</a></span>
               <el-input v-model="modalData.customerResponsiblePerson"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="4" v-if="false">
             <el-form-item label="客户负责人联系方式">
               <el-input v-model="modalData.customerResponsiblePersonPhone"></el-input>
             </el-form-item>
@@ -209,6 +209,18 @@
                                 :use-default-value="modalData.flag === '1'"></dict-data-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item prop="trackerName">
+              <span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">跟单员</a></span>
+              <el-input v-model="modalData.trackerName"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="quoterName">
+              <span style="cursor: pointer" slot="label" @click="getBaseList(2002)"><a herf="#">报价专员</a></span>
+              <el-input v-model="modalData.quoterName"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
@@ -245,20 +257,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="10">
-          <el-col :span="4">
-            <el-form-item prop="trackerName">
-              <span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">跟单员</a></span>
-              <el-input v-model="modalData.trackerName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item prop="quoterName">
-              <span style="cursor: pointer" slot="label" @click="getBaseList(2002)"><a herf="#">报价专员</a></span>
-              <el-input v-model="modalData.quoterName"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row :gutter="10" v-if="false">
           <el-col :span="24">
             <el-form-item label="备注" style="display: block;min-height: 90px">
@@ -2449,14 +2447,6 @@ export default {
             this.$message.warning('请选择询价专员名称！')
             return
           }
-          if (this.modalData.testPartNo === '' || this.modalData.testPartNo == null) {
-            this.$message.warning('请选择产品编码！')
-            return
-          }
-          if (this.modalData.partName === '' || this.modalData.partName == null) {
-            this.$message.warning('请选择产品名称！')
-            return
-          }
           if (this.modalData.priorityLevel === '' || this.modalData.priorityLevel == null) {
             this.$message.warning('请选择优先等级！')
             return

src/views/modules/test/requestForTest.vue

@@ -385,7 +385,7 @@
           <el-tab-pane label="制程信息" :disabled="!activeTabList.includes('process')" name="process">
             <test-routing-table v-if="clickTestRow" ref="dialogSoRouting" v-model:data-list="testSoRoutingList" :test-no="modalData.testNo"></test-routing-table>
           </el-tab-pane>
-          <el-tab-pane label="附件" :disabled="!activeTabList.includes('file')" name="file">
+          <el-tab-pane label="附件信息" :disabled="!activeTabList.includes('file')" name="file">
             <test-file v-if="modalFlag" :column-list="fileColumnList" v-model:data-list="testFileList" ref="dialogTestFile" :test-no="modalData.testNo"></test-file>
           </el-tab-pane>
         </el-tabs>
@@ -719,7 +719,7 @@
       <el-tab-pane label="制程信息" name="test_so_routing" style="padding: 5px">
         <test-routing-table ref="tabSoBom" :test-no="testCurrentRow.testNo" v-model:data-list="testSoRoutingList" :height="500" ></test-routing-table>
       </el-tab-pane>
-      <el-tab-pane label="附件" name="file">
+      <el-tab-pane label="附件信息" name="file">
         <test-file ref="tabFile" :column-list="fileColumnList" v-model:data-list="testFileList" :test-no="testCurrentRow.testNo" :height="500"></test-file>
       </el-tab-pane>