multiple/assets/logo/Logo.png

Binary files differ

 multiple/assets/logo/logo.png

 multiple/config.json

@@ -6,41 +6,14 @@
    "logo": "logo/Logo.png",
    "favicon": "favicon/favicon.ico"
  },
  "TEST": {
  "LC": {
    "env": {
      "VITE_APP_TITLE": "工厂数字化MOM系统",
      "VITE_BASE_API": "http://1.15.17.182:9048",
      "VITE_JAVA_API": "http://1.15.17.182:9049"
      "VITE_BASE_API": "http://1.15.17.182:9054",
      "VITE_JAVA_API": "http://1.15.17.182:9055"
    },
    "logo": "logo/Logo.png",
    "logo": "logo/logo.png",
    "favicon": "favicon/favicon.ico"
  },
  "SDJC": {
    "env": {
      "VITE_APP_TITLE": "黎城县胜德建材有限公司",
      "VITE_BASE_API": "http://36.138.236.153:9000",
      "VITE_JAVA_API": "http://36.138.236.153:9001"
    },
    "logo": "logo/SDJCLogo.png",
    "favicon": "favicon/SDJCfavicon.ico"
  },
  "KS": {
    "env": {
      "VITE_APP_TITLE": "黎城康森商砼有限公司",
      "VITE_BASE_API": "http://36.138.236.176:9000",
      "VITE_JAVA_API": "http://36.138.236.176:9001"
    },
    "logo": "logo/KSLogo.png",
    "favicon": "favicon/KSfavicon.ico"
  },
  "DZZB": {
    "env": {
      "VITE_APP_TITLE": "山西丹朱装备制造股份有限公司",
      "VITE_BASE_API": "http://36.138.236.176:9000",
      "VITE_JAVA_API": "http://36.138.236.176:9001"
    },
    "logo": "logo/DZZBLogo.png",
    "favicon": "favicon/DZZBfavicon.ico"
  },
  "logo": "/src/assets/logo/logo.png",
  "favicon": "/public/favicon.ico"

 src/views/basicData/product/ProductSelectDialog.vue

@@ -174,10 +174,11 @@
  }
}

// 监听弹窗打开，重置选择
// 监听弹窗打开，重置选择并刷新数据
watch(() => props.modelValue, (visible) => {
  if (visible) {
    multipleSelection.value = [];
    loadData();
  }
});


 src/views/collaborativeApproval/journal/index.vue

@@ -69,6 +69,8 @@
            <el-tag>{{ getLogTypeText(scope.row.logType) }}</el-tag>
          </template>
        </el-table-column>
        <el-table-column prop="content" label="日志内容" align="center" />
        <el-table-column prop="remark" label="备注" align="center" />
        <el-table-column prop="createUserName" label="创建人" align="center" />
        <el-table-column prop="createTime" label="创建时间" align="center" />
        <el-table-column prop="ccUserName" label="抄送人" align="center" />
@@ -149,7 +151,7 @@
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="抄送人" prop="ccUserIds">
            <el-form-item label="抄送人" prop="ccUserIds" required>
              <el-select
                v-model="form.ccUserIds"
                multiple
@@ -212,7 +214,7 @@
          </div>
        </div>
        <div class="detail-info">
          <span><el-icon><User /></el-icon> 创建人：{{ currentJournal.createUser }}</span>
          <span><el-icon><User /></el-icon> 创建人：{{ currentJournal.createUserName }}</span>
          <span><el-icon><Timer /></el-icon> 创建时间：{{ currentJournal.createTime }}</span>
        </div>
        <el-divider />
@@ -328,6 +330,10 @@
    ],
    content: [
      { required: true, message: "日志内容不能为空", trigger: "blur" }
    ],
    ccUserIds: [
      { required: true, message: "请选择抄送人", trigger: "change", type: "array" },
      { min: 1, message: "请至少选择一个抄送人", trigger: "change", type: "array" }
    ]
  }
});