2025/7/3

src/views/modules/part/routingManagement.vue

@@ -1872,6 +1872,42 @@ export default {
           fixed: '',
           columnWidth: 150
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table2WorkCenterNo',
+          tableId: '104003Table2',
+          tableName: 'Routing工序表',
+          columnProp: 'workCenterNo',
+          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: 104003,
+          serialNumber: '104003Table2WorkCenterDesc',
+          tableId: '104003Table2',
+          tableName: 'Routing工序表',
+          columnProp: 'workCenterDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '加工中心名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 104003,
@@ -2034,42 +2070,6 @@ export default {
           fixed: '',
           columnWidth: 120
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 104003,
-          serialNumber: '104003Table2WorkCenterNo',
-          tableId: '104003Table2',
-          tableName: 'Routing工序表',
-          columnProp: 'workCenterNo',
-          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: 104003,
-          serialNumber: '104003Table2WorkCenterDesc',
-          tableId: '104003Table2',
-          tableName: 'Routing工序表',
-          columnProp: 'workCenterDesc',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '加工中心名称',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 200
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 104003,
@@ -4706,6 +4706,13 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.searchRoutingTools()
+        if(this.routingToolList.length>0){
+          this.$alert('该工序已绑定刀具，不允许删除！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return
+        }
         this.detailData.updateBy = this.$store.state.user.name
         routingDetailDelete(this.detailData).then(({data}) => {
           if (data && data.code === 0) {

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

@@ -2002,7 +2002,7 @@
                 this.$message.error(error);
               })
               if (ossDeleteFlag===false){
-                this.$alert('请先删除项目的附件信息！', '提示', {
+                this.$alert('该项目已存在附件，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return
@@ -2027,7 +2027,7 @@
                 }
               })
               if (partDeleteFlag===false){
-                this.$alert('请先删除项目的物料信息！', '提示', {
+                this.$alert('该项目已绑定物料信息，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return
@@ -2052,7 +2052,7 @@
                 }
               });
               if (quotationDeleteFlag===false){
-                this.$alert('请先删除项目的询价信息！', '提示', {
+                this.$alert('该项目已存在询价信息，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return
@@ -2074,7 +2074,7 @@
                 }
               })
               if (quoteDeleteFlag===false){
-                this.$alert('请先删除项目的报价信息！', '提示', {
+                this.$alert('该项目已存在报价信息，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return
@@ -2098,7 +2098,7 @@
                 }
               })
               if (proofingDeleteFlag===false){
-                this.$alert('请先删除项目的打样信息！', '提示', {
+                this.$alert('该项目已存在打样信息，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return;
@@ -2122,7 +2122,7 @@
                 }
               });
               if (testDeleteFlag===false){
-                this.$alert('请先删除项目的测试记录！', '提示', {
+                this.$alert('该项目已存在测试信息，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return
@@ -2146,7 +2146,7 @@
                 }
               })
               if (toolDeleteFlag===false){
-                this.$alert('请先删除项目的刀模申请！', '提示', {
+                this.$alert('该项目已存在刀模申请，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return
@@ -2169,7 +2169,7 @@
                 }
               });
               if (technicalSpecificationDeleteFlag===false){
-                this.$alert('请先删除项目的技术参数卡！', '提示', {
+                this.$alert('该项目已绑定技术参数卡，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return
@@ -2192,7 +2192,7 @@
                 }
               })
               if(changeDeleteFlag===false){
-                this.$alert('请先删除项目的变更记录！', '提示', {
+                this.$alert('该项目已存在变更记录，不允许删除！', '提示', {
                   confirmButtonText: '确定'
                 })
                 return

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

@@ -270,6 +270,13 @@
         </el-col>
       </el-row>
 
+      <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>
+          </div>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
           <div class="grid-content bg-purple">
@@ -395,6 +402,24 @@
         <el-button type="primary" @click="submitModalFlag = false">取消</el-button>
       </el-footer>
     </el-dialog>
+
+    <el-dialog width="530px" 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>
+        </el-form-item>
+        <el-form-item label="关联料号/Related Part No." class="auto-form">
+            <el-input type="textarea" v-model="dataEntryForm.relevancePartNo" :rows="4" resize='none'></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div style="margin-top: 5px">
+          <el-button type="primary" @click="refresh()">刷新</el-button>
+          <el-button type="primary" @click="submitDataEntry()">保存</el-button>
+          <el-button @click="dataEntryFlag = false" type="primary">取消</el-button>
+        </div>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -458,6 +483,7 @@
         quotationOfficerFlag: false,
         engineerFlag: false,
         technicianFlag: false,
+        dataEntryFlag: false,
         dccVisible: false,
         operatorList:[],
         dccList: [],
@@ -543,6 +569,10 @@
           faiOperatorList: [],
           dccList: []
         },
+        dataEntryForm: {
+          remarkPage: '',
+          relevancePartNo: ''
+        },
         dataRole: {
           partTypeDesc: [
             {
@@ -817,6 +847,7 @@
             })
           }
         })
+        this.dataEntryFlag = false
       },
 
       searchTable () {
@@ -1367,6 +1398,34 @@
         this.dataForm.dccList = JSON.parse(JSON.stringify(this.dccList))
         this.dccVisible = false
       },
+
+      handleDataEntry(){
+        this.dataEntryForm.remarkPage = this.dataForm.remarkPage
+        this.dataEntryForm.relevancePartNo = this.dataForm.relevancePartNo
+        this.dataEntryFlag = true
+      },
+
+      submitDataEntry(){
+        let params = {
+          ...this.dataForm,
+          remarkPage: this.dataEntryForm.remarkPage,
+          relevancePartNo: this.dataEntryForm.relevancePartNo,
+          site: this.searchData.site,
+          userName: this.$store.state.user.name,
+          codeNo: this.searchData.codeNo,
+          menuId: '103002'
+        }
+        updateBMBasicInformation(params).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message.success( '操作成功')
+            this.$clearHighLight()
+            this.searchTable()
+            this.dataEntryFlag = false
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      }
     },
 
     watch: {