页面样式调整

src/views/mes/dv/brandquotation/brandquotationApply.vue

@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-            <el-form-item label="品牌名称" prop="brandName">
+      <el-form-item label="品牌名称" prop="brandName">
         <el-input
           v-model="queryParams.brandName"
           placeholder="请输入品牌名称"
@@ -136,7 +136,11 @@
       row-key="brandQuotationId"
       default-expand-all
     >
-      <el-table-column label="品牌报价单编码" width="180" prop="brandQuotationCode">
+      <el-table-column
+        label="品牌报价单编码"
+        width="140"
+        prop="brandQuotationCode"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -149,13 +153,18 @@
       </el-table-column>
       <el-table-column
         label="品牌报价名称"
-        width="180"
         align="center"
         prop="brandQuotationName"
         :show-overflow-tooltip="true"
       />
-            <el-table-column label="金额" width="180" align="center" prop="amount" :formatter="r => this.formatMoney(r.amount)"/>
-            <el-table-column
+      <el-table-column
+        label="金额"
+        width="120"
+        align="center"
+        prop="amount"
+        :formatter="(r) => this.formatMoney(r.amount)"
+      />
+      <el-table-column
         label="品牌名称"
         width="120"
         align="center"
@@ -169,12 +178,13 @@
         prop="itemName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="工艺路线名称" align="center" prop="routeName">
+      <el-table-column show-overflow-tooltip label="工艺路线名称" align="center" prop="routeName">
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" />
       <el-table-column
         label="操作"
         width="200px"
+        fixed="right"
         align="center"
         class-name="small-padding fixed-width"
       >
@@ -241,7 +251,13 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 //导入品牌报价js
-import { listBrandQuotation, getBrandQuotation, delBrandQuotation, addBrandQuotation, updateBrandQuotation } from "@/api/mes/dv/brandquotation";
+import {
+  listBrandQuotation,
+  getBrandQuotation,
+  delBrandQuotation,
+  addBrandQuotation,
+  updateBrandQuotation,
+} from "@/api/mes/dv/brandquotation";
 
 export default {
   name: "PrototypeRequest",
@@ -412,7 +428,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal
-        .confirm('是否确认删除编号为"' + row.brandQuotationId + '"的品牌报价单？')
+        .confirm(
+          '是否确认删除编号为"' + row.brandQuotationId + '"的品牌报价单？'
+        )
         .then(function () {
           return delBrandQuotation(row.brandQuotationId);
         })
@@ -455,15 +473,14 @@ export default {
         .catch(() => {});
     },
     // 生成制作单
-  generatea(row) {
-    // 跳转到制作单界面
-    const prototypeRequestId = row.prototypeRequestId || this.ids;
-    this.$router.push(
-      "/mes/pro/prototypeMake/apply?prototypeRequestId=" + prototypeRequestId
-    );
-    return;
-  },
+    generatea(row) {
+      // 跳转到制作单界面
+      const prototypeRequestId = row.prototypeRequestId || this.ids;
+      this.$router.push(
+        "/mes/pro/prototypeMake/apply?prototypeRequestId=" + prototypeRequestId
+      );
+      return;
+    },
   },
-  
 };
 </script>

src/views/mes/dv/brandquotation/brandquotationInfo.vue

 <template>
-  <div class="form-page" v-loading="loading">
+  <div v-loading="loading">
     <PageTitle>
       {{ pageTitle }}
       <!-- 申请按钮显示 -->
@@ -24,9 +24,8 @@
         label-width="100px"
       >
         <el-row>
-          <el-col :md="6" :sm="12" :xs="12">
-            <el-form-item prop="brandQuotationCode">
-              <template slot="label"> 编码 </template>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="编码" prop="brandQuotationCode">
               <el-input
                 disabled
                 v-model="form.brandQuotationCode"
@@ -35,7 +34,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :md="6" :sm="12" :xs="12">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="名称" prop="brandQuotationName">
               <el-input
                 v-model="form.brandQuotationName"
@@ -43,53 +42,17 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :md="6" :sm="12" :xs="12">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="总金额" prop="amount">
-              <el-input-money 
-              v-model="form.amount" 
-              v-bind:disabled="form.brandQuotationId==0"
-              placeholder="新增时不可输入，请修改时操作"/>
+              <el-input-money
+                v-model="form.amount"
+                v-bind:disabled="form.brandQuotationId == 0"
+                placeholder="新增时不可输入，请修改时操作"
+              />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="6">
-            <el-form-item label="品牌" prop="brandCode">
-              <el-input v-model="form.brandName" readonly="readonly">
-                <el-button
-                  slot="append"
-                  icon="el-icon-search"
-                  @click="handleBrandSelect"
-                  placeholder="请选择品牌"
-                ></el-button>
-              </el-input>
-            </el-form-item>
-            <BrandSelect
-              ref="brSelect"
-              @onSelected="onBrandSelected"
-            ></BrandSelect>
-          </el-col> -->
-          <!-- <el-col :span="6">
-            <el-form-item label="品牌名称" prop="brandName">
-              <el-input v-model="form.brandName" readonly="readonly" />
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="8">
-            <el-form-item label="品牌编码" prop="brandCode">
-              <el-input v-model="form.brandCode" readonly="readonly">
-                <el-button
-                  slot="append"
-                  icon="el-icon-search"
-                  @click="handleBrandSelect"
-                  :disabled="form.brandContactId"
-                ></el-button>
-              </el-input>
-            </el-form-item>
-            <BrandSelect
-              ref="brSelect"
-              @onSelected="onBrandSelected"
-            ></BrandSelect>
-          </el-col> -->
 
-          <el-col :md="6" :sm="12" :xs="12">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="产品" prop="itemId">
               <el-input
                 v-model="form.itemName"
@@ -106,13 +69,17 @@
             </el-form-item>
           </el-col>
 
-            <el-col :span="8">
-                <el-form-item label="品牌名称" prop="brandName">
-                    <el-input v-model="form.brandName" placeholder="请先将所选产品绑定品牌" disabled/>
-                </el-form-item>
-            </el-col>    
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="品牌名称" prop="brandName">
+              <el-input
+                v-model="form.brandName"
+                placeholder="请先将所选产品绑定品牌"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
 
-          <el-col :md="6" :sm="12" :xs="12">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="工艺路线" prop="routeId">
               <el-input
                 v-model="form.routeName"
@@ -133,7 +100,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :md="24" :sm="12" :xs="12">
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="备注" prop="remark">
               <el-input
                 type="textarea"
@@ -174,10 +141,22 @@ import {
 // 导入品牌选择框
 import BrandSelect from "@/components/brandSelect/single.vue";
 //导入品牌报价js
-import { listBrandQuotation, getBrandQuotation, delBrandQuotation, addBrandQuotation, updateBrandQuotation } from "@/api/mes/dv/brandquotation";
+import {
+  listBrandQuotation,
+  getBrandQuotation,
+  delBrandQuotation,
+  addBrandQuotation,
+  updateBrandQuotation,
+} from "@/api/mes/dv/brandquotation";
 
 export default {
-  components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect, BrandSelect },
+  components: {
+    ProogingBom,
+    ProogingProcess,
+    ItemSelect,
+    RoutesProcessSelect,
+    BrandSelect,
+  },
   dicts: [],
   provide() {
     return {
@@ -205,9 +184,13 @@ export default {
       // 表单校验
       rules: {
         brandId: [
-          { required: true, message: "品牌不能为空,请先查验所选产品是否已绑定品牌", trigger: "blur" }
-        ],             
-        }
+          {
+            required: true,
+            message: "品牌不能为空,请先查验所选产品是否已绑定品牌",
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   computed: {
@@ -229,11 +212,11 @@ export default {
   created() {
     this.getFormInfo();
     if (this.mode == "apply") {
-    this.gCode();
+      this.gCode();
     }
   },
   methods: {
-            //选择品牌
+    //选择品牌
     handleBrandSelect() {
       this.$refs.brSelect.showFlag = true;
     },
@@ -322,8 +305,11 @@ export default {
             this.loading = false;
             this.$modal.msgSuccess("提交成功！");
 
-            // 关闭页签
-            tabPlugins.closeOpenPage();
+            this.$nextTick(() => {
+              // 关闭页签
+              tabPlugins.closeOpenPage();
+              this.$router.replace({ path: "/mes/dv/brandquotation/query" });
+            });
           })
           .catch(() => {
             this.loading = false;

src/views/mes/dv/brandquotation/components/ProogingProcess.vue

@@ -15,12 +15,12 @@
         v-if="mode != 'info'"
         label="操作"
         align="center"
-        width="150"
+        width="300"
+        fixed="right"
       >
         <template slot-scope="{ row, $index }">
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="openSetProd(row, $index)"
           >
@@ -42,7 +42,6 @@
           </el-button>
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="updateRow(row, $index)"
             >修改</el-button

src/views/mes/pro/productiorequest/components/ProogingProcess.vue

@@ -15,12 +15,12 @@
         v-if="mode != 'info'"
         label="操作"
         align="center"
-        width="150"
+        width="300"
+        fixed="right"
       >
         <template slot-scope="{ row, $index }">
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="openSetProd(row, $index)"
           >
@@ -28,7 +28,6 @@
           </el-button>
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="openSetQrindex(row, $index)"
           >
@@ -36,7 +35,6 @@
           </el-button>
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="openSetTool(row, $index)"
           >
@@ -44,7 +42,6 @@
           </el-button>
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="updateRow(row, $index)"
             >修改</el-button

src/views/mes/pro/prototypeMake/components/ProogingProcess.vue

@@ -15,12 +15,12 @@
         v-if="mode != 'info'"
         label="操作"
         align="center"
-        width="150"
+        width="300"
+        fixed="right"
       >
         <template slot-scope="{ row, $index }">
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="openSetProd(row, $index)"
           >
@@ -28,7 +28,6 @@
           </el-button>
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="openSetQrindex(row, $index)"
           >
@@ -36,7 +35,6 @@
           </el-button>
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="openSetTool(row, $index)"
           >
@@ -44,7 +42,6 @@
           </el-button>
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="updateRow(row, $index)"
             >修改</el-button
@@ -59,7 +56,6 @@
       ref="ProcessProdRef"
       @updateItem="updateItem"
     />
-    />
     <ProcessQcindex
       :process="currentRow"
       ref="ProcessQcindexRef"

src/views/mes/pro/workorder/indexApply.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="68px"
+    >
       <!-- <el-form-item label="工单编码" prop="workorderCode">
         <el-input
           v-model="queryParams.workorderCode"
@@ -172,7 +179,8 @@
           size="mini"
           @click="handleImport"
           v-hasPermi="['mes:pro:workorder:edit']"
-        >导入工单</el-button>
+          >导入工单</el-button
+        >
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -180,7 +188,6 @@
       ></right-toolbar>
     </el-row>
 
-
     <!-- 用户导入对话框 -->
     <el-dialog title="导入工单" :visible.sync="upload.open" width="400px">
       <el-upload
@@ -199,7 +206,13 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -254,9 +267,10 @@
       </el-table-column>
       <el-table-column
         label="工艺名称"
-        width="140"
+        width="160"
         align="center"
         prop="routeName"
+        show-overflow-tooltip
       />
       <el-table-column
         label="订单编号"
@@ -338,15 +352,17 @@
             v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:workorder:edit']"
-          >修改</el-button> 
-           <el-button
+            >修改</el-button
+          >
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             v-if="scope.row.status == 'PREPARE'"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:pro:workorder:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
           <!-- <el-button
             size="mini"
             type="text"
@@ -368,7 +384,7 @@
             v-hasPermi="['mes:pro:workorder:update']"
             >完成</el-button
           > -->
-         
+
           <!-- <el-button
             size="mini"
             type="text"
@@ -679,7 +695,7 @@ import VendorSelect from "@/components/vendorSelect/single.vue";
 import { genCode } from "@/api/system/autocode/rule";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { getToken } from '@/utils/auth'
+import { getToken } from "@/utils/auth";
 
 export default {
   name: "Workorder",
@@ -728,7 +744,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData"
+        url: process.env.VUE_APP_BASE_API + "/mes/pro/workorder/importData",
       },
       // 查询参数
       queryParams: {
@@ -754,19 +770,19 @@ export default {
         requestDate: null,
         parentId: null,
         ancestors: null,
-        status: 'PREPARE',
+        status: "PREPARE",
       },
-// 表单状态
+      // 表单状态
       options: [
-          { value: "PREPARE", label: "待确认" },
-          { value: "CONFIRMED", label: "已确认" },
-          { value: "APPROVING", label: "审批中" },
-          { value: "APPROVED", label: "已审批" },
-          { value: "FINISHED", label: "已完成" },
-          { value: "TASKGENERATED", label: "已生成任务单" },
-          { value: "ISSUEGENERATED", label: "已生成领料单" },
-          { value: "PRODUCIONG", label: "生产中" },
-        ],
+        { value: "PREPARE", label: "待确认" },
+        { value: "CONFIRMED", label: "已确认" },
+        { value: "APPROVING", label: "审批中" },
+        { value: "APPROVED", label: "已审批" },
+        { value: "FINISHED", label: "已完成" },
+        { value: "TASKGENERATED", label: "已生成任务单" },
+        { value: "ISSUEGENERATED", label: "已生成领料单" },
+        { value: "PRODUCIONG", label: "生产中" },
+      ],
       // 表单参数
       form: {},
       // 表单校验
@@ -819,8 +835,11 @@ export default {
       });
     },
     importTemplate() {
-      this.download('mes/pro/workorder/importTemplate', {
-      }, `work_order_template_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/pro/workorder/importTemplate",
+        {},
+        `work_order_template_${new Date().getTime()}.xlsx`
+      );
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -835,7 +854,13 @@ export default {
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
       this.getList();
     },
     // 提交上传文件
@@ -1123,12 +1148,18 @@ export default {
     },
     /** 完成任务单操作 */
     confirmWorkorder(row) {
-      this.$modal.confirm('是否将工单编号"' + row.workorderCode + '"的草稿数据项改为已确认？').then(function() {
-        return confirmedWorkorder(row.workorderId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("已确认成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm(
+          '是否将工单编号"' + row.workorderCode + '"的草稿数据项改为已确认？'
+        )
+        .then(function () {
+          return confirmedWorkorder(row.workorderId);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("已确认成功");
+        })
+        .catch(() => {});
     },
     //自动生成编码
     handleAutoGenChange(autoGenFlag) {

src/views/mes/qt/factoryQuote/index.vue

@@ -85,27 +85,27 @@
 
     <el-table v-loading="loading" :data="factoryQuoteList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"/>
-      <el-table-column label="客户编号" prop="clientCode"/>
-      <el-table-column label="客户名称" prop="clientName"/>
-      <el-table-column label="产品编号" prop="itemCode"/>
-      <el-table-column label="产品名称" prop="itemName"/>
-      <el-table-column label="价格" prop="price"/>
-      <el-table-column label="有效期起" prop="validFrom" width="180">
+      <el-table-column label="客户编号" width="120" prop="clientCode"/>
+      <el-table-column label="客户名称" width="180" prop="clientName"/>
+      <el-table-column label="产品编号" width="160" prop="itemCode"/>
+      <el-table-column label="产品名称" min-width="200" show-overflow-tooltip prop="itemName"/>
+      <el-table-column label="价格" width="100" prop="price"/>
+      <el-table-column label="有效期起" prop="validFrom" width="140">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.validFrom, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="有效期至" prop="validTo" width="180">
+      <el-table-column label="有效期至" prop="validTo" width="140">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.validTo, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" prop="state">
+      <el-table-column label="状态" prop="state" width="100">
         <template slot-scope="{row}">
           {{ row.state === '0' ? '草稿' : row.state === '1' ? '审批中' : row.state === '2' ? '发布中' : '已发布'}}
         </template>
       </el-table-column>
-      <el-table-column label="操作" class-name="small-padding fixed-width">
+      <el-table-column width="120" fixed="right" label="操作" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.state === '0' || scope.row.state === '2'"