优化

src/view/performance/12-orderAccounting/index.vue

@@ -11,34 +11,22 @@
               <el-button type="primary"icon="edit"class="bt"@click=" () => { dialogDetail = true; } "><i class="el-icon-edit" />查改</el-button>
               <!--<el-button type="primary" disabled icon="edit" @click="" style="margin-left: 10px">工艺方案复制</el-button>-->
               <el-button type="primary" icon="edit" class="bt" @click=" () => { dialogGdcjstj = true; }">工单超节损统计</el-button>
-
               <el-button type="primary" icon="edit" class="bt" @click=" () => { dialogKhsz = true}">考核设置</el-button>
-
               <el-button type="primary" icon="edit" class="bt"@click=" () => { dialogXzgdtl = true; }">修正工单投料</el-button>
-
               <el-button type="primary" icon="edit" class="bt"@click=" () => { dialogGxclhc = true;}">工序产量核查</el-button>
-
               <el-button type="primary"icon="edit"class="bt"@click="() => {dialogGdzjfptj = true;}">工单质检废品统计</el-button>
-
               <el-button type="primary" icon="edit" class="bt"@click="() => {dialogHjfpfb = true;}">核检废品分布</el-button>
-
               <el-button type="primary" icon="edit" class="bt"@click="handleGddy">工单打印</el-button>
-
               <el-button type="primary" icon="edit" class="bt" @click="pd_lcdlistonClick">流程单查询</el-button>
-
               <el-button type="primary" icon="edit" class="bt" @click="exportExcel">导出Excel</el-button>
-
               <el-button type="primary" icon="edit" class="bt" @click="ygdy">超节损员工打印</el-button>
             </el-form-item>
           </el-form>
 
-          <!-- 弹窗 -->
           <div>
             <!-- 查改 -->
-            <Detail v-if="dialogDetail" :is-show="dialogDetail" :gdbh="gdbh"
-            :yjno="yjno"
+            <Detail v-if="dialogDetail" :is-show="dialogDetail" :gdbh="gdbh" :yjno="yjno"
             @destroy="() => {dialogDetail = false;}"/>
-
             <!-- 工单超节损统计 -->
             <el-dialog v-model="dialogGdcjstj"  title="工单超节损统计" destroy-on-close >
               <Gdcjstj :gdbh="gdbh" :yjno ="yjno" />
@@ -121,24 +109,23 @@
                   </layout-sider>
                   <layout-main>
                     <!-- 这里放右侧的内容 -->
-                    <el-space wrap>
-                      <!-- 右侧内容 -->
-                      <template v-for="item in processList.total_process">
-                        <el-button
-                          disabled
-                          :type="
-                            !processList.process.includes(item)
-                              ? 'danger'
-                              : 'info'
-                          "
-                          plain
-                          style="width: 50px"
-                        >{{ item }}</el-button>
-                      </template>
-                    </el-space>
-                  </layout-main>
-                </layout>
-              </div>
+                    	  <div style="display: flex; align-items: center;margin-left: 20px;">
+                    	  	<el-tag type="success" style="width: 55px; height: 40px; margin-right: 10px;"><h2>流程号</h2></el-tag>
+                    	  	<h2 style="margin: 0 20px 0 0;">绿格子图标表示“已完成”</h2>
+                    	  	<el-tag type="danger" style="width: 55px; height: 40px; margin-right: 10px;"><h2>流程号</h2></el-tag>
+                    	  	<h2 style="margin: 0;">红格子图标表示“未完成”</h2>
+                    	  </div>
+                    	  <br>
+                           <el-space wrap style="margin-left: 20px;">
+                            <!-- 右侧内容 -->
+                            <template v-for="item in processList.total_process">
+                    			<el-button  class="custom-button" disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px;">{{ item }}</el-button>
+                              <!-- <el-button disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px">{{ item }}</el-button> -->
+                            </template>
+                          </el-space>
+                        </layout-main>
+                      </layout>
+                    </div>
             </el-dialog>
           </div>
         </div>
@@ -162,7 +149,7 @@
           <!-- 上方列表 -->
           <div class="gva-table-box">
             <el-table
-              style="width: 100%; height: 30vh"
+              style="width: 100%; height: 33vh"
               :data="tableData1"
               row-key="ID"
               highlight-current-row
@@ -224,7 +211,6 @@
               :label="column.label"
               :width="column.width"
               show-overflow-tooltip="true"
-              sortable
             />
           </el-table>
         </layout-content>
@@ -323,42 +309,42 @@ getSideData()
 const tableCols1 = [
   // { label: '超损工单', prop: 'csgd', width: '110' ,sortable:'sortable'},
   { label: '工单编号', prop: 'Gd_gdbh', width: '110',sortable:'sortable',fixed:'fixed',align:'left'},
-  { label: '印件号', prop: 'jjcp_yjno', width: '95' ,sortable:'sortable'},
-  { label: '联数', prop: 'yj_ls', width: '80' ,sortable:'sortable'},
-  { label: '产品代号', prop: '成品编码', width: '120' ,sortable:'sortable'},
+  { label: '印件号', prop: 'jjcp_yjno', width: '70'},
+  { label: '联数', prop: 'yj_ls', width: '70'},
+  { label: '产品代号', prop: '成品编码', width: '110' ,sortable:'sortable'},
   { label: '产品名称', prop: '成品名称', width: '250' ,sortable:'sortable'},
-  { label: '实际投料', prop: '实际投料', width: '115' ,sortable:'sortable'},
-  { label: '计量单位', prop: '计量单位', width: '115' ,sortable:'sortable'},
+  { label: '实际投料', prop: '实际投料', width: '90'},
+  { label: '计量单位', prop: '计量单位', width: '85'},
   { label: '入仓日期', prop: 'warehousing_date', width: '110' ,sortable:'sortable'},
-  { label: '入仓数量', prop: 'warehousing_num', width: '110' ,sortable:'sortable'},
+  { label: '入仓数量', prop: 'warehousing_num', width: '90'},
   { label: '目标合格率', prop: 'target_rate', width: '120' ,sortable:'sortable'},
   { label: '实际合格率', prop: 'real_rate', width: '120' ,sortable:'sortable'},
   { label: '奖惩系数', prop: 'reward_rate', width: '110' ,sortable:'sortable'},
   { label: '奖罚金额合计', prop: 'reward_money', width: '140',sortable:'sortable' },
   { label: '废品合计', prop: '废品合计', width: '120' ,sortable:'sortable'},
   { label: '工单无形损', prop: '工单无形损', width: '120',sortable:'sortable' },
-  { label: '材料废', prop: '材料废', width: '120' ,sortable:'sortable'},
-  { label: '零头处理', prop: '零头处理', width: '120',sortable:'sortable' },
-  { label: '处发废', prop: '外发废', width: '120',sortable:'sortable' },
-  { label: '外摊废', prop: '分摊废', width: '120' ,sortable:'sortable'},
-  { label: '工单计划损耗', prop: '工单计划损耗', width: '140',sortable:'sortable' },
-  { label: '工单制程废', prop: 'zcfp', width: '120',sortable:'sortable' },
-  { label: '工单检验废', prop: '工单质检废', width: '120',sortable:'sortable' },
-  { label: '年月', prop: 'date', width: '120' ,sortable:'sortable'},
+  { label: '材料废', prop: '材料废', width: '80' },
+  { label: '零头处理', prop: '零头处理', width: '90'},
+  { label: '处发废', prop: '外发废', width: '80' },
+  { label: '外摊废', prop: '分摊废', width: '80'},
+  { label: '工单计划损耗', prop: '工单计划损耗', width: '110'},
+  { label: '工单制程废', prop: 'zcfp', width: '100' },
+  { label: '工单检验废', prop: '工单质检废', width: '100'},
+  { label: '年月', prop: 'date', width: '80'},
 ]
 const tableCols2 = [
-  { label: '工单编号', prop: 'Gy0_gdbh', width: '120' },
-  { label: '印件及工序', prop: 'Gy0_yjno', width: '120' },
-  { label: '工序名称', prop: 'Gy0_gxmc', width: '200' },
+  { label: '工单编号', prop: 'Gy0_gdbh', width: '115' },
+  { label: '印件及工序', prop: 'Gy0_yjno', width: '115' },
+  { label: '工序名称', prop: 'Gy0_gxmc', width: '210' },
   { label: '联数', prop: 'Gy0_ls', width: '80' },
-  { label: '基础损耗', prop: 'Gy0_Rate0', width: '120' },
-  { label: '损耗率', prop: 'Gy0_Rate1', width: '120' },
-  { label: '损耗系数', prop: '损耗系数', width: '120' },
-  { label: '计损色数', prop: 'Gy0_ms', width: '120' },
-  { label: '计划产量', prop: 'Gy0_计划接货数', width: '120' },
-  { label: '计划损耗', prop: 'Gy0_计划损耗', width: '120' },
-  { label: '上报产量', prop: 'total_cl', width: '120' },
-  { label: '制程废', prop: 'total_fp', width: '120' },
+  { label: '基础损耗', prop: 'Gy0_Rate0', width: '115' },
+  { label: '损耗率', prop: 'Gy0_Rate1', width: '115' },
+  { label: '损耗系数', prop: '损耗系数', width: '110' },
+  { label: '计损色数', prop: 'Gy0_ms', width: '110' },
+  { label: '计划产量', prop: 'Gy0_计划接货数', width: '110' },
+  { label: '计划损耗', prop: 'Gy0_计划损耗', width: '110' },
+  { label: '上报产量', prop: 'total_cl', width: '110' },
+  { label: '制程废', prop: 'total_fp', width: '110' },
 ]
 const tableData1 = ref([])
 const tableData2 = ref([])
@@ -815,4 +801,18 @@ const exitXzgdtl = (data) => {
 .mab {
   margin-bottom: 5px;
 }
+/*!* 流程单查询按钮颜色控制未完成*/
+:deep(.custom-button.el-button--info) {
+	background-color: palegreen !important;
+  color: #155724;
+  font-size: 20px;
+  border-color: #c3e6cb;
+}
+/* 已完成 */
+:deep(.custom-button.el-button--danger) {
+	background-color: rgb(236, 135, 135) !important;
+  color: #721c24;
+  font-size: 20px;
+  border-color: #f5c6cb;
+}
 </style>