Merge branch 'fix_20240123_UAT' into 'master'

Fix 20240123 uat

See merge request laws-foton-slrs/foton-laws-system-front!165

src/pages/details/otherBussStandardDetails/index.vue

@@ -1373,6 +1373,7 @@ export default {
   data () {
     return {
       score: 0,
+      XGLC:'',
       externalStatus:'',
       QFTP: false,
       textOptions: [],
@@ -1672,7 +1673,7 @@ export default {
     getScore () {
       //查询动态评价总平均分和质量评价总平均分
       let standId = this.$route.params.id
-      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId,prcNum:this.XGLC}, {
         _this: this
       }, res => {
         if (res.ok) {
@@ -2490,6 +2491,12 @@ export default {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
+          if (res.data.attrInfoMap && res.data.attrInfoMap.XGLC){
+            let XGLCData = res.data.attrInfoMap.XGLC.split(',')
+            this.XGLC = XGLCData[XGLCData.length - 1]
+          }else{
+            this.XGLC = ''
+         }
           if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/QCBFC') !== -1) {
             this.QFTP = true
           }
@@ -3395,7 +3402,7 @@ export default {
       this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION
     }, e => {
     })
-    this.getScore()
+
     /*
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
       _this: this
@@ -3448,6 +3455,7 @@ export default {
     this.getOrgTreeSource()
     this.standItemEO.standId = this.$route.params.id
     Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
+      this.getScore()
       const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
       // const relatedPlansRes = await this.queryRelatedPlans()
       // const relatedPlans = relatedPlansRes.list

src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue

@@ -97,6 +97,7 @@
                   <el-date-picker :disabled="disabledXX"
                                   v-model="form.endTime"
                                   type="date"
+                                  :picker-options="pickerOptions"
                                   placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
@@ -544,6 +545,10 @@ export default {
     }
   },
   methods: {
+    disabledPastDate(time) {
+      // 禁用今天之前的日期
+      return time.getTime() < Date.now() - 8.64e7;
+    },
     getTaskId() {
       this.ccc = true
       queryTaskFirst({

src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue

@@ -1021,7 +1021,7 @@ export default {
       }
 
       this.footerLoading = true
-
+      this.form.prcNum = this.$route.query.prcNum
       const json = JSON.stringify({
         form: this.form,
         roleForm: this.roleForm