Merge remote-tracking branch 'origin/master'

src/views/modules/changeManagement/changeRecord.vue

@@ -4158,7 +4158,7 @@
         if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404') {
           this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
         } else {
-          this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{codeNo:row.codeNo},})
+          this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{nowCodeNo:row.codeNo},})
         }
       },
 

src/views/modules/part/partInformation.vue

@@ -17,6 +17,18 @@
           <el-option label="否" value="N"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'物料状态'">
+        <el-select v-model="searchData.status" clearable style="width: 120px">
+          <el-option label="正式物料" value="Y"></el-option>
+          <el-option label="临时物料" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'IFS料号'">
+        <el-input v-model="searchData.ifsPartNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'录入时间'">
         <el-date-picker
           style="width: 120px"
@@ -1533,7 +1545,9 @@
           spec: '',
           active: '',
           page: 1,
-          limit: 10
+          limit: 10,
+          status: '',
+          ifsPartNo: ''
         },
         // 其它
         loading: false,

src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue

@@ -68,16 +68,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item >
-              <span slot="label" style="" @click="getBaseList(102,2)"><a herf="#">终端客户</a></span>
-              <el-input v-model="dataForm.finalCustomerId"  @blur="getCustomerName(2)"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="终端客户名称：">
-              <el-input v-model="dataForm.finalCustomerName" disabled ></el-input>
+            <el-form-item label="终端客户">
+<!--              <span slot="label" style="" @click="getBaseList(102,2)"><a herf="#">终端客户</a></span>-->
+<!--              <el-input v-model="dataForm.finalCustomerId"  @blur="getCustomerName(2)"></el-input>-->
+
+              <dict-data-select v-model="dataForm.finalCustomerId" clearable dict-type="finalCustomer" :use-default-value="false"></dict-data-select>
+
             </el-form-item>
           </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="终端客户名称：">-->
+<!--              <el-input v-model="dataForm.finalCustomerName" disabled ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-form-item label="项目描述" style="height: 70px">
           <el-input type="textarea" resize="none" :autosize="{minRows: 2, maxRows: 2}" v-model="dataForm.projectDesc" ></el-input>

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

@@ -520,6 +520,9 @@
         })
       },
       jumpBom(){
+        if(this.bomData.engChgLevel!=null||this.bomData.engChgLevel!==''){
+          this.$message.error("bom明细不存在")
+        }
         let inData={
           site:this.searchData.site,
           partNo:this.bomData.partNo,

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

@@ -1465,6 +1465,9 @@
         })
       },
       jumpRoute(){
+        if(this.routeData.routingRevision!=null||this.routeData.routingRevision!==''){
+          this.$message.error("route明细不存在")
+        }
         let inData={
           site:this.searchData.site,
           partNo:this.routeData.partNo,

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

@@ -788,7 +788,7 @@
         }).then(() => {
           let tempData = {
             site: this.searchData.site,
-            userName: this.searchData.username,
+            userName: this.$store.state.user.name,
             codeNo: this.searchData.codeNo,
             menuId: '103002'
           }