2025-05-16

src/views/modules/proofing/requestForProofing.vue

@@ -201,6 +201,11 @@
               <el-input-number :controls="false" :disabled="detailVisible" :min="0" v-model="modalData.proofingNumber" :step="0" style="width: 100%"></el-input-number>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="打样金额" prop="proofingAmount" :show-message="false">
+              <el-input-number :controls="false" :disabled="detailVisible" v-model="modalData.proofingAmount" :step="0" style="width: 100%"></el-input-number>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="优先等级" :show-message="false">
               <dict-data-select v-if="modalFlag" :disabled="columnFlagByHeader('priorityLevel') || detailVisible"
@@ -1069,7 +1074,8 @@ export default {
         rejectFlag: '',
         rejectStepId: '',
         isReject: '',
-        nodeId: ''
+        nodeId: '',
+        proofingAmount: undefined,
       },
       proofingDetailData: {
         technicalConsiderations: '',
@@ -2465,6 +2471,7 @@ export default {
         isReject: row.isReject,
         nodeId: row.nodeId,
         approvalUsername: row.approvalUsername,
+        proofingAmount: row.proofingAmount,
       }
       this.searchDelegateAccessByUser();
       this.modalDisableFlag = true

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

@@ -698,7 +698,6 @@
           //区分请求成功和失败的状况
           if (data && data.code == 0) {
             this.dataForm = data.row
-            console.log(this.dataForm)
             this.getNodeAuthority(data.row)
             let inData = {
               site: this.dataForm.site,
@@ -930,41 +929,40 @@
       },
       // 获取流程的配置权限
        getNodeAuthority (row) {
-            getBMStatusDesc(this.searchData).then(({data}) => {
-              this.superAdmin=data.superAdmin
-              if(data.superAdmin){
-                this.ifDisableFlag = false
-                return false
-              }
-              if (data.status === '已完成' || data.status === '已升版') {
-                this.ifDisableFlag = true
-                return false
+          getBMStatusDesc(this.searchData).then(({data}) => {
+            this.superAdmin=data.superAdmin
+            if(data.superAdmin){
+              this.ifDisableFlag = false
+              return false
+            }
+            if (data.status === '已完成' || data.status === '已升版') {
+              this.ifDisableFlag = true
+              return false
+            }
+            if(data.status === '审批中') {
+              let tempData = {
+                site: row.site,
+                stepId: row.stepId,
+                menuId: '103002'
               }
-              if(data.status === '审批中') {
-                let tempData = {
-                  site: row.site,
-                  stepId: row.stepId,
-                  menuId: '103002'
-                }
-                getNodeAuthority(tempData).then(({data}) => {
-                  if (data && data.code === 0) {
-                    this.ifDisableFlag = true
-                    let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
-                    let arr = plmStepRoleBaseBm.filter(a => a.fieldId === 'basicInformation')
-                    if (arr.length > 0) {
-                      if (arr[0].updateFlag === 'N') {
-                        this.ifDisableFlag = true
-                      } else {
-                        this.ifDisableFlag = false
-                      }
-                    } else {
+              getNodeAuthority(tempData).then(({data}) => {
+                if (data && data.code === 0) {
+                  this.ifDisableFlag = true
+                  let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
+                  let arr = plmStepRoleBaseBm.filter(a => a.fieldId === 'basicInformation')
+                  if (arr.length > 0) {
+                    if (arr[0].updateFlag === 'N') {
                       this.ifDisableFlag = true
+                    } else {
+                      this.ifDisableFlag = false
                     }
+                  } else {
+                    this.ifDisableFlag = true
                   }
-                })
-              }
-            })
-
+                }
+              })
+            }
+          })
       },
 
       // 同意提交