样式调整

src/views/bonus/approve/approveDetails.vue

@@ -21,7 +21,7 @@
             <el-input v-model="rejectText" type="textarea" :rows="3" placeholder="请输入拒绝原因"></el-input>
             <div class="pt-3 text-right">
               <m-button size="mini" @click="visible = false">取消</m-button>
-              <m-button size="mini" type="primary" @click="onReject">提交</m-button>
+              <m-button size="mini" type="orange" @click="onReject">提交</m-button>
             </div>
             <template #reference>
               <m-button type="danger" size="small" icon="el-icon-close">拒绝</m-button>

src/views/humanResources/welfare/welfareList/welfareRules.vue

@@ -1,66 +1,48 @@
 <template>
-  <m-dialog ref="dialog" :title="itemData.subsidy?.subsidyName + ' 规则配置'" width="1000px" @sure="onSure">
+  <m-dialog ref="dialog" title="规则配置" width="1000px" @sure="onSure">
     <el-form ref="form" :model="formQuery" v-loading="loading">
-      <m-table
-        shadow="naver"
-        :items="formQuery.items"
-        :headers="headers"
-      >
-        <div class="text-center mt-3">
-          <m-button icon="el-icon-plus" type="primary" size="small" @click="onAdd">添加一行</m-button>
-        </div>
-        <!-- <template #subsidyOrganizationNos="scope">
-          <el-form-item
-            :prop="`items.${scope.$index}.subsidyOrganizationNos`"
-            :rules="{ required: true, message: '请输入机构名称', trigger: 'blur' }"
-          >
-          <el-cascader
-            v-model="formQuery.items[scope.$index].subsidyOrganizationNos"
-            placeholder="请输入机构名称"
-            :ref="'cascader' + scope.$index"
-            :options="organizationTree"
-            :show-all-levels="false"
-            collapse-tags
-            :props="{
-              checkStrictly: false,
-              label: 'organizationName',
-              value: 'organizationNo',
-              children: 'child',
-              emitPath: false,
-              multiple: true
-            }"
-            @change="onChange($event, scope)"
-          ></el-cascader>
-          </el-form-item>
-        </template> -->
-        <template #subsidySalary="scope">
-          <el-form-item
-            :prop="`items.${scope.$index}.subsidySalary`"
-            :rules="{ required: true, message: '请输入福利薪资', trigger: 'blur' }"
-          >
-            <el-input-number
-              v-model="formQuery.items[scope.$index].subsidySalary"
-              placeholder="福利薪资"
-            ></el-input-number>
-          </el-form-item>
-        </template>
-        <template #subsidyCheck="scope">
-          <el-form-item
-            :prop="`items.${scope.$index}.subsidyCheck`"
-            :rules="{ required: true, message: '请输入福利条件描述', trigger: 'blur' }"
-          >
-            <el-input
-              v-model="formQuery.items[scope.$index].subsidyCheck"
-              placeholder="福利条件描述"
-              type="textarea"
-              :autosize="{ minRows: 1.335, maxRows: 4}"
-            ></el-input>
-          </el-form-item>
-        </template>
-        <template #actions="scope">
-          <m-button class="mb-5" size="small" text type="danger" @click="onDelete(scope)">移除</m-button>
-        </template>
-      </m-table>
+      <el-form-item label="福利名称">
+        <el-tag>{{ itemData.subsidy?.subsidyName }}</el-tag>
+      </el-form-item>
+      <el-form-item label="福利配置">
+        <m-table
+          shadow="naver"
+          :items="formQuery.items"
+          :headers="headers"
+        >
+          <div class="text-center mt-3">
+            <m-button icon="el-icon-plus" type="orange" size="small" @click="onAdd">添加一行</m-button>
+          </div>
+          <template #subsidySalary="scope">
+            <el-form-item
+              :prop="`items.${scope.$index}.subsidySalary`"
+              :rules="{ required: true, message: '请输入福利薪资', trigger: 'blur' }"
+            >
+              <el-input-number
+                v-model="formQuery.items[scope.$index].subsidySalary"
+                placeholder="福利薪资"
+              ></el-input-number>
+            </el-form-item>
+          </template>
+          <template #subsidyCheck="scope">
+            <el-form-item
+              :prop="`items.${scope.$index}.subsidyCheck`"
+              :rules="{ required: true, message: '请输入福利条件描述', trigger: 'blur' }"
+            >
+              <el-input
+                v-model="formQuery.items[scope.$index].subsidyCheck"
+                placeholder="福利条件描述"
+                type="textarea"
+                :autosize="{ minRows: 1.335, maxRows: 4}"
+              ></el-input>
+            </el-form-item>
+          </template>
+          <template #actions="scope">
+            <m-button class="mb-5" size="small" text type="danger" @click="onDelete(scope)">移除</m-button>
+          </template>
+        </m-table>
+      </el-form-item>
+
     </el-form>
   </m-dialog>
 </template>

src/views/login/index.vue

@@ -40,7 +40,7 @@
             </el-input>
           </el-form-item>
           <el-form-item>
-            <m-button type="primary" @click="handleLogin('ruleForm')" style="width: 100%;" :loading="loading">登录</m-button>
+            <m-button type="orange" @click="handleLogin('ruleForm')" style="width: 100%;" :loading="loading">登录</m-button>
           </el-form-item>
         </el-form>
       </div>
@@ -140,7 +140,7 @@ export default {
 
       .title {
         font-size: 1.5rem;
-        color: #1867c0;
+        color: $theme-color;
         margin: 0px;
         text-align: center;
         font-weight: bold;

src/views/salary/comparison/salaryEmployeeComparison/index.vue

@@ -3,9 +3,9 @@
     <m-search :items="searchItems" v-model="searchValues" class="mb-3" @search="onSearch">
       <template #button>
         <el-upload class="el-button pa-0" action="#" :show-file-list="false" :http-request="onImport">
-          <m-button type="primary" icon="el-icon-upload2" :loading="importLoading" plain>导入手工数据</m-button>
+          <m-button type="orange" icon="el-icon-upload2" :loading="importLoading" plain>导入手工数据</m-button>
         </el-upload>
-        <m-button type="primary" icon="el-icon-download" :loading="downloadLoading" plain @click="onExport">导出手工数据模板</m-button>
+        <m-button type="orange" icon="el-icon-download" :loading="downloadLoading" plain @click="onExport">导出手工数据模板</m-button>
       </template>
     </m-search>
     <m-table
@@ -46,7 +46,7 @@
                     <m-button v-if="checked"  type="text" size="small" icon="el-icon-check" disabled>已使用当前版本</m-button>
                     <m-button
                       v-else
-                      type="primary"
+                      type="orange"
                       size="small"
                       @click="onConfirm(list)"
                     >确认使用该版本</m-button>

src/views/system/update/components/logDetails.vue

@@ -7,7 +7,7 @@
       <div class="d-flex box-content-header">
         执行日志版本 [ 2411141542 ]
         <div>
-          <m-button type="primary" size="small">下载</m-button>
+          <m-button type="orange" size="small">下载</m-button>
           <m-button type="danger" size="small">解锁运行状态</m-button>
         </div>
       </div>

src/views/system/update/system/index.vue

@@ -17,7 +17,7 @@
         <div class="el-upload__tip" slot="tip">请上传.zip、.7z、.bin等文件格式的更新包</div>
       </el-upload>
       <div class="pa-3">
-        <m-button type="primary" size="small" :disabled="!file" icon="el-icon-s-promotion" @click="onUpdate" :loading="loading">执行且更新</m-button>
+        <m-button type="orange" size="small" :disabled="!file" icon="el-icon-s-promotion" @click="onUpdate" :loading="loading">执行且更新</m-button>
       </div>
     </div>
     <div class="box-content">