update:修改生产管理和质量管理页面样式

src/views/mes/pro/arrange/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="组合单号" prop="arrangeCode">
         <el-input
           v-model="queryParams.arrangeCode"
@@ -140,7 +140,7 @@
 
     <!-- 添加或修改生产编排单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="组合单号" prop="arrangeCode">
           <el-input v-model="form.arrangeCode" placeholder="请输入组合单号"/>
         </el-form-item>

src/views/mes/pro/combination/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="组合单号" prop="combinationCode">
         <el-input
           v-model="queryParams.combinationCode"
@@ -142,7 +142,7 @@
 
     <!-- 添加或修改生产组合单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="组合单号" prop="combinationCode">
           <el-input v-model="form.combinationCode" placeholder="请输入组合单号"/>
         </el-form-item>

src/views/mes/pro/process/index.vue

@@ -127,18 +127,17 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="11">
             <el-form-item label="工序编码" prop="processCode">
+              <div style="display:flex;align-items: center;">
                 <el-input v-model="form.processCode" placeholder="请输入工序编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item  label-width="80">
                 <el-switch v-model="autoGenFlag"
                     active-color="#13ce66"
+                    style="width:175px;margin-left:10px;"
                     active-text="自动生成"
                     @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
                 </el-switch>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="7">

src/views/mes/pro/proroute/index.vue

@@ -171,24 +171,23 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="11">
             <el-form-item label="编号" prop="routeCode">
+              <div style="display:flex;align-items: center;">
                 <el-input
                   v-model="form.routeCode"
                   placeholder="请输入工艺路线编号"
                 />
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label-width="80">
                 <el-switch
                   v-model="autoGenFlag"
+                  style="width:175px;margin-left:10px;"
                   active-color="#13ce66"
                   active-text="自动生成"
                   @change="handleAutoGenChange(autoGenFlag)"
                   v-if="optType != 'view'"
                 >
                 </el-switch>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="7">

src/views/mes/pro/usage/index.vue

@@ -127,18 +127,16 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="11">
             <el-form-item label="用途编码" prop="usageCode">
+              <div style="display: flex;align-items: center;">
                 <el-input v-model="form.usageCode" placeholder="请输入用途编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
+                <el-switch style="margin-left:10px;width:175px;" v-model="autoGenFlag"
                     active-color="#13ce66"
                     active-text="自动生成"
                     @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
                 </el-switch>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="7">

src/views/mes/pro/workorder/indexApply.vue

@@ -293,6 +293,15 @@
           >
         </template>
       </el-table-column>
+
+      <el-table-column label="单据状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.mes_workorder_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="组合单号"
         width="180"
@@ -311,34 +320,10 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="工单名称"
-        width="200"
-        align="center"
-        prop="workorderName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="工单类型" align="center" prop="workorderType">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.mes_workorder_type"
-            :value="scope.row.workorderType"
-          />
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="工单来源" align="center" prop="orderSource">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.mes_workorder_sourcetype"
-            :value="scope.row.orderSource"
-          />
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        label="工艺名称"
-        width="160"
+        label="编排单号"
         align="center"
-        prop="routeName"
-        show-overflow-tooltip
+        width="100px"
+        prop="arrangeCode"
       />
       <el-table-column
         label="订单编号"
@@ -365,6 +350,16 @@
         prop="productSpc"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="需求日期"
+        align="center"
+        prop="requestDate"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitOfMeasure"/>
       <el-table-column label="工单数量" align="center" prop="quantity"/>
       <el-table-column label="调整数量" align="center" prop="quantityChanged"/>
@@ -380,37 +375,44 @@
         width="100px"
         prop="batchCode"
       />
-      <el-table-column
-        label="编排单号"
-        align="center"
-        width="100px"
-        prop="arrangeCode"
-      />
-      <!-- <el-table-column label="客户编码" align="center" prop="clientCode"/>
+      <el-table-column label="客户编码" align="center" prop="clientCode"/>
       <el-table-column
         label="客户名称"
         align="center"
         prop="clientName"
         :show-overflow-tooltip="true"
-      /> -->
-      <el-table-column
-        label="需求日期"
+      />
+      <!-- <el-table-column
+        label="工单名称"
+        width="200"
         align="center"
-        prop="requestDate"
-        width="180"
-      >
+        prop="workorderName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="工单类型" align="center" prop="workorderType">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
+          <dict-tag
+            :options="dict.type.mes_workorder_type"
+            :value="scope.row.workorderType"
+          />
         </template>
-      </el-table-column>
-      <el-table-column label="单据状态" align="center" prop="status" fixed="right">
+      </el-table-column> -->
+      <!-- <el-table-column label="工单来源" align="center" prop="orderSource">
         <template slot-scope="scope">
           <dict-tag
-            :options="dict.type.mes_workorder_status"
-            :value="scope.row.status"
+            :options="dict.type.mes_workorder_sourcetype"
+            :value="scope.row.orderSource"
           />
         </template>
-      </el-table-column>
+      </el-table-column> -->
+      <!-- <el-table-column
+        label="工艺名称"
+        width="160"
+        align="center"
+        prop="routeName"
+        show-overflow-tooltip
+      /> -->
+
       <el-table-column
         label="操作"
         width="150px"

src/views/mes/qc/abnormal/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
         <!-- <el-form-item label="异常类型" prop="abnormalType">
         <el-input
           v-model="queryParams.abnormalType"
@@ -128,14 +128,14 @@
 
     <!-- 添加或修改异常信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <!-- <el-form-item label="异常类型" prop="abnormalType">
           <el-select v-model="form.abnormalType" placeholder="请选择异常类型">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item> -->
         <el-form-item label="异常类型" prop="abnormalType">
-              <el-select v-model="form.abnormalType" placeholder="请选择异常类型">
+              <el-select style="width:100%;" v-model="form.abnormalType" placeholder="请选择异常类型">
                 <el-option
                   v-for="dict in dict.type.pc_abnormal_type"
                   :key="dict.value"
@@ -148,7 +148,7 @@
           <el-input v-model="form.abnormalReason" placeholder="请输入异常原因" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/mes/qc/ipqc/index.vue

@@ -178,18 +178,17 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="检验单编号" prop="ipqcCode">
+              <div style="display:flex;align-items: center;">
                 <el-input v-model="form.ipqcCode" placeholder="请输入检验单编号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item  label-width="80">
                 <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
                   active-text="自动生成"
+                  style="width:175px;margin-left:10px;"
                   @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
                 </el-switch>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/mes/qc/qcindex/index.vue

@@ -137,18 +137,17 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="检测项编码" prop="indexCode">
+              <div style="display:flex;align-items: center;">
                 <el-input v-model="form.indexCode" placeholder="请输入检测项编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item  label-width="80">
                 <el-switch v-model="autoGenFlag"
                     active-color="#13ce66"
                     active-text="自动生成"
+                    style="width:175px;margin-left:10px;"
                     @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
                 </el-switch>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -160,7 +159,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="检测项类型" prop="indexType">
-              <el-select v-model="form.indexType" placeholder="请选择检测项类型">
+              <el-select style="width:100%;" v-model="form.indexType" placeholder="请选择检测项类型">
                 <el-option
                   v-for="dict in dict.type.mes_index_type"
                   :key="dict.value"
@@ -172,7 +171,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="输入类型" prop="inputType">
-              <el-select v-model="form.inputType" placeholder="请选择输入类型">
+              <el-select style="width:100%;" v-model="form.inputType" placeholder="请选择输入类型">
                 <el-option key="1" label="文本框" :value="1"></el-option>
                 <el-option key="2" label="选择框" :value="2"></el-option>
               </el-select>

src/views/mes/qc/qctemplate/index.vue

@@ -137,18 +137,18 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="模板编号" prop="templateCode">
+              <div style="display:flex;align-items: center;">
                 <el-input v-model="form.templateCode" placeholder="请输入模板编号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item  label-width="80">
                 <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
                   active-text="自动生成"
+                  style="width:175px;margin-left:10px;"
                   @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
               </el-switch>
+              </div>
+
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/mes/qc/report/index.vue

@@ -132,7 +132,7 @@
           <dict-tag :options="dict.type.qc_submit_status" :value="scope.row.abnormalStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="300" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
            <el-button
             size="mini"
@@ -143,7 +143,8 @@
           >完成</el-button>
            <el-button
            size="mini"
-           type="primary" 
+           type="text"
+           icon="el-icon-upload2"
            @click="0"
            >提交</el-button>
           <el-button

src/views/mes/qc/templateProcess/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="检测模板" prop="templateName">
         <el-input
           v-model="queryParams.templateName"
@@ -136,7 +136,7 @@
 
     <!-- 添加或修改检测模板-工序对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="检测模板" prop="templateId">
           <el-input v-model="form.templateName" placeholder="请选择检测模板" >
             <el-button slot="append" @click="handleSelectTemplate" icon="el-icon-search"></el-button>
@@ -153,13 +153,13 @@
           <el-input v-model="form.maxNum" placeholder="请输入最大数量" />
         </el-form-item>
         <el-form-item label="是否质检确认" prop="isConfirm">
-          <el-select v-model="form.isConfirm" placeholder="请选择是否质检确认">
+          <el-select style="width:100%;" v-model="form.isConfirm" placeholder="请选择是否质检确认">
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="是否新品" prop="isNewProduct">
-          <el-select v-model="form.isNewProduct" placeholder="请选择是否新品">
+          <el-select style="width:100%;" v-model="form.isNewProduct" placeholder="请选择是否新品">
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
           </el-select>