田源
2023-10-26 a75ed7b2ec701afa546895653903e9c1f35db2b1
主数据添加 编码申请添加-ts时间戳bug
已修改3个文件
33 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/code/codeApply.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -881,6 +881,8 @@
    },
    //增加保存
    AddSumbit(val) {
      console.log(val)
      val.ts = val.ts.toISOString().replace("Z", "");
      addSaveCode(val).then(res => {
        this.$nextTick(() => {
          this.addvisible = false;
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -38,7 +38,8 @@
        </el-button>
        </span>
                <!--    预览排序-->
        <el-button icon="el-icon-arrow-down" size="small" @click="orderHandle" v-if="permissionList.orderStatus">预览排序</el-button>
        <el-button v-if="permissionList.orderStatus" icon="el-icon-arrow-down" size="small" @click="orderHandle">预览排序
        </el-button>
        <span v-if="permissionList.removeStatus">
           <!--    删除-->
        <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-delete" size="small"
@@ -46,7 +47,9 @@
        </el-button>
        </span>
        <!--    重置-->
        <el-button icon="el-icon-refresh-right" size="small" @click="resetHandler" v-if="permissionList.resetStatus">重置</el-button>
        <el-button v-if="permissionList.resetStatus" icon="el-icon-refresh-right" size="small" @click="resetHandler">
          重置
        </el-button>
      </el-button-group>
      <el-button-group>
       <span v-if="permissionList.injectStatus"><!--        分类注入-->
@@ -72,12 +75,15 @@
      <el-button-group>
        <!--    同步到其他模板-->
        <el-button icon="el-icon-share" size="small" @click="syncHandle" v-if="permissionList.syncStatus">同步到其他模板</el-button>
        <el-button v-if="permissionList.syncStatus" icon="el-icon-share" size="small" @click="syncHandle">同步到其他模板
        </el-button>
      </el-button-group>
      <el-button-group>
        <!--    编码申请预览-->
        <el-button icon="el-icon-view" size="small" style="" @click="applicationHandle" v-if="permissionList.applicationStatus">编码申请预览</el-button>
        <el-button v-if="permissionList.applicationStatus" icon="el-icon-view" size="small" style=""
                   @click="applicationHandle">编码申请预览
        </el-button>
      </el-button-group>
      <!-- 是否开启编辑     -->
@@ -317,9 +323,9 @@
    <el-table v-if="this.crudArrayFlag"
              ref="referAttrCrud"
              v-loading="loading"
              border
              :data="ProData"
              :height="this.tableHeight"
              border
              style="width: 100%"
              @select="selectHandle"
              @cell-click="handleCellClicks"
@@ -396,6 +402,7 @@
import func from "@/util/func";
import {getCurrentInstance} from "vue";
import {mapGetters} from "vuex";
export default {
  name: "attrCrud .vue",
  props: {
@@ -2217,6 +2224,7 @@
/deep/ .el-table__fixed {
  height: calc(100vh - 612px)!important;
}
///deep/ .el-table__fixed[v-if='editStyleFlag'] {
//  height: calc(100vh - 152px)!important; // 编辑状态下的高度
//}
@@ -2229,6 +2237,7 @@
  width: 10px;
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
  background-color: #ececec;
Source/UBCS-WEB/src/views/code/codeApply.vue
@@ -157,15 +157,6 @@
      // 进行表单校验
      const formValidate = await this.$refs.FormTemplate.validate();
      if (!formValidate) return;
      let codeValidate = true;
      // 进行码值申请校验
      // if (this.showCodeApply) {
      //   codeValidate = await this.$refs.CodeApply.validate();
      //   if (!codeValidate) {
      //     this.activeName = "codeApply";
      //     return false;
      //   }
      // }
      let resembleQueryList = [];
      if (this.showResembleQuery && this.$refs.resembleQueryRef) {
        // 进行相似项查询
@@ -226,6 +217,7 @@
      resForm.codeRuleOid = this.codeRuleOid;
      resForm.templateOid = this.templateOid;
      // this.$emit("submit", resForm);
      resForm.ts = resForm.ts.toISOString().replace("Z", "");
      addSaveCode(resForm).then(res => {
        this.$nextTick(() => {
          this.addvisible = false;
@@ -233,7 +225,7 @@
          this.onLoad()
        })
      })
      console.log(resForm)
      // console.log(resForm)
    },
    getDefaultValueAndFormValues(form) {
      let defaultValue = {};