Browse Source

排程更改

cz 10 months ago
parent
commit
60834dd704

+ 33 - 3
src/components/byTable/index.vue

@@ -56,7 +56,7 @@
           </el-button>
           </el-button>
         </div>
         </div>
         <div class="by-dropdown" v-for="(i, index) in selectConfigCopy" :key="i.prop">
         <div class="by-dropdown" v-for="(i, index) in selectConfigCopy" :key="i.prop">
-          <div v-if="i.type" class="selectTime" style="display:flex;align-items:center">
+          <div v-if="i.type=='time'" class="selectTime" style="display:flex;align-items:center">
             <span style="font-size: 14px;height:32px;margin-right:15px">{{i.label || ''}}</span>
             <span style="font-size: 14px;height:32px;margin-right:15px">{{i.label || ''}}</span>
             <el-date-picker v-model="pagination[i.prop]" :type="i.itemType?i.itemType:'date'" size="small" :placeholder="i.placeholder"
             <el-date-picker v-model="pagination[i.prop]" :type="i.itemType?i.itemType:'date'" size="small" :placeholder="i.placeholder"
                             style="width:120px" :value-format="dateFormatInit(i.itemType)"
                             style="width:120px" :value-format="dateFormatInit(i.itemType)"
@@ -68,6 +68,23 @@
                             @change="i.fn?i.fn(pagination[i.propOne]):searchItemSelctOne(i,pagination[i.prop],pagination[i.propOne])"
                             @change="i.fn?i.fn(pagination[i.propOne]):searchItemSelctOne(i,pagination[i.prop],pagination[i.propOne])"
                             :clearable="i.clearable!=undefined?i.clearable :true" />
                             :clearable="i.clearable!=undefined?i.clearable :true" />
           </div>
           </div>
+          <div v-else-if="i.type=='btn'">
+            <div class="by-dropdown-title">
+              <!-- 操作
+              <i style="margin-left: 5px" class="iconfont icon-iconm_xialan1"></i> -->
+              <el-button type="primary"> 操作</el-button>
+            </div>
+            <ul class="by-dropdown-lists boxBtn">
+              <!-- <li v-for="j in i.data" :key="j.value" @click="i.fn?i.fn(j.value):()=>{}">
+                {{ j.label }}
+              </li> -->
+
+              <li v-for="j in i.data" :key="j.value">
+                <el-button type="primary" @click="i.fn?i.fn(j.value):()=>{}"> {{ j.label }}</el-button>
+              </li>
+
+            </ul>
+          </div>
           <div v-else>
           <div v-else>
             <div class="by-dropdown-title">
             <div class="by-dropdown-title">
               {{getSelectLabel(pagination[i.prop],i) || i.label || i.labelCopy}}
               {{getSelectLabel(pagination[i.prop],i) || i.label || i.labelCopy}}
@@ -688,7 +705,7 @@ export default defineComponent({
   border-color: #b2b4b9;
   border-color: #b2b4b9;
 }
 }
 .el-table .cell {
 .el-table .cell {
-  line-height: 34px;
+  line-height: 24px;
 }
 }
 </style>
 </style>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
@@ -868,7 +885,6 @@ export default defineComponent({
   ul {
   ul {
     position: absolute;
     position: absolute;
     left: 0;
     left: 0;
-
     top: 32px;
     top: 32px;
     padding: 0;
     padding: 0;
     margin: 0;
     margin: 0;
@@ -889,6 +905,20 @@ export default defineComponent({
       color: #0084ff;
       color: #0084ff;
     }
     }
   }
   }
+  .boxBtn {
+    padding-bottom: 8px;
+    li {
+      font-size: 14px;
+      text-align: left;
+      height: auto;
+      line-height: auto;
+      margin-top: 8px;
+    }
+    li:hover {
+      opacity: 1;
+      background: none;
+    }
+  }
 }
 }
 
 
 .by-dropdown::before {
 .by-dropdown::before {

+ 2 - 2
src/views/EHSD/procurement/purchasedEHSD/index.vue

@@ -931,10 +931,10 @@ const clickUpdate = (row) => {
 
 
 ::v-deep(.greenClass) {
 ::v-deep(.greenClass) {
   // color: #fff !important;
   // color: #fff !important;
-  background-color: #cab211 !important;
+  background-color: #eae2af !important;
   .el-table-fixed-column--left,
   .el-table-fixed-column--left,
   .el-table-fixed-column--right {
   .el-table-fixed-column--right {
-    background-color: #cab211;
+    background-color: #eae2af;
   }
   }
 }
 }
 </style>
 </style>

File diff suppressed because it is too large
+ 420 - 386
src/views/MES/productionTask/index.vue


Some files were not shown because too many files changed in this diff