Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA

cuiqian2004

2025-03-21 986da22689dc9a5faef751c02348fb1f47584414

 pages/modal/5601.vue

@@ -24,6 +24,7 @@
                        </image>
                        <checkbox-group @change="checkboxChange">
                           <div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
                           <div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
                              @tap="onPanelClick(ii,style.form.htmlobjId)"
                              :id="'dvpanel'+style.form.htmlobjId"
                              :class="style.form.htmlobjId==active_id?'bk-active':''">
@@ -31,7 +32,7 @@
                              <div class="dv-panel-button"
                                 v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0">

                                 <checkbox v-if="pageData.Select_Button==true" :model="ii"
                                 <checkbox v-if="pageData.Select_Button==true" :value="ii"
                                    :checked="style.SelBut_Checked" />
                                 <!-- <text></text> -->
                                 <!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">保存</Button> -->
@@ -1291,6 +1292,13 @@
                                       attr.value,
                                       attr.operation
                                    )
                              if (ele2.name != 'Layout') {
                                 if (ele2.fieldId == attr.attr) {
                                    ele2.value = $this.operationNumber(
                                       ele2.value,
                                       attr.value,
                                       attr.operation
                                    )
                                 }
                              } else if (ele2.name == 'Layout') {
                                 ele2.setting.colList.forEach(col => {
@@ -1416,7 +1424,15 @@
                        if (ele.name != 'Layout') {
                           if (ele.fieldId == attr.attr)
                              ele.value = attr.value;
                           if (ele.fieldId == attr.attr)
                              ele.value = attr.value;
                        } else if (ele.name == 'Layout') {
                           ele.setting.colList.forEach(col => {
                              if (col) {
                                 if (col.fieldId == attr.attr)
                                    col.value = attr.value;
                              }
                           });
                           ele.setting.colList.forEach(col => {
                              if (col) {
                                 if (col.fieldId == attr.attr)
@@ -1483,6 +1499,7 @@
                  if (data.clear == false) {
                     var isflag = true;
                     pageData.DefList.forEach((style, index) => {
                        if (style.form.objId == detailStyle.form.objId) {
                        if (style.form.objId == detailStyle.form.objId) {
                           cont.attrs.forEach(attr => {
                              style.form.items.forEach(ele => {
@@ -3085,10 +3102,6 @@
            padding: 0px;
            margin: 0;

            .dv-panel-form-item {
               margin: 0;
               padding: 0px;
            }

            .uni-forms-item {
               padding-bottom: 5rpx;
@@ -3115,15 +3128,10 @@
                  vertical-align: middle;
               }

               .form-item-span {
                  vertical-align: text-top;
                  color: #2d8cf0;
                  white-space: normal;
                  word-break: break-all;
                  width: 100%;
               .uni-input:hover {
                  border: 1px solid rgb(41, 121, 255);
               }
            }



         }
@@ -3247,13 +3255,13 @@
         background-color: #f3f3f3 !important;
      }

      ::v-deep .uni-row {
         margin-bottom: 0px;
      }
      // ::v-deep .uni-row {
      //    margin-bottom: 0px;
      // }

      .view-tabpage ::v-deep .uni-row {
         margin-bottom: 5px;
      }
      // .view-tabpage ::v-deep .uni-row {
      //    margin-bottom: 5px;
      // }

      .demo-uni-col {
         height: 36px;