修改部分样式，更新mm模块路由

clll

2023-12-25 7c73d1f5786bce1b7fcab5bf8c3cf50a5e1fd4b1

修改部分样式，更新mm模块路由

 north-glass-erp/.idea/workspace.xml

@@ -212,7 +212,7 @@
      <workItem from="1702631535326" duration="205000" />
      <workItem from="1702858329054" duration="9016000" />
      <workItem from="1703031064839" duration="55055000" />
      <workItem from="1703463546867" duration="1756000" />
      <workItem from="1703463546867" duration="5864000" />
    </task>
    <task id="LOCAL-00001" summary="第一次推送">
      <option name="closed" value="true" />

 north-glass-erp/northglass-erp/src/router/index.js

@@ -715,8 +715,20 @@
              path: 'PaymentPurchaseOrder',
              name: 'PaymentPurchaseOrder',
              component: () => import('../views/mm/purchaseOrder/Payment.vue')
            }
            , {
            },
            /*----------- 退货 ----------------*/
            {
              path: 'ReturnPurchaseOrder',
              name: 'ReturnPurchaseOrder',
              component: () => import('../views/mm/purchaseOrder/Return.vue')
            },
            /*----------- 入库 ----------------*/
            {
              path: 'StoragePurchaseOrder',
              name: 'StoragePurchaseOrder',
              component: () => import('../views/mm/purchaseOrder/Storage.vue')
            },
            {
              path: '',
              redirect: '/main/purchaseOrder/SelectPurchaseOrder'
            }

 north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOMDetails.vue

@@ -74,9 +74,9 @@
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {title: '操作', width: 60, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'checkbox',fixed:"left", title: '基准BOM', width: 110 },
    { type: 'checkbox',fixed:"left", title: '标准BOM', width:110 },
    { type: 'checkbox',fixed:"left", title: '审核', width: 80 },
    { slots: { default: 'state' }, title: '基准BOM', width: 110 },
    { slots: { default: 'state' }, title: '标准BOM', width: 110 },
    { slots: { default: 'state' }, title: '审核', width: 80 },
    {field: 'customerNumber', width: 120, title: '客户编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: 'customerName',width: 120, title: '客户名称', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'productNumber', width: 130,title: '产品编号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -238,6 +238,10 @@
        </ul>
      </template>

      <template #state="{ row}">
        <el-checkbox checked/>
      </template>

      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>

 north-glass-erp/northglass-erp/src/views/pp/BOM/SelectBOM.vue

@@ -73,9 +73,9 @@
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {title: '操作', width: 80, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'checkbox',fixed:"left", title: '基准BOM', width: 110 },
    { type: 'checkbox',fixed:"left", title: '标准BOM', width: 110 },
    { type: 'checkbox',fixed:"left", title: '审核', width: 80 },
    { slots: { default: 'state' }, title: '基准BOM', width: 110 },
    { slots: { default: 'state' }, title: '标准BOM', width: 110 },
    { slots: { default: 'state' }, title: '审核', width: 80 },
    {field: 'customerNumber', width: 120, title: '客户编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: 'customerName',width: 120, title: '客户名称', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'productNumber', width: 130,title: '产品编号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -207,6 +207,10 @@
        </ul>
      </template>

      <template #state="{ row}">
        <el-checkbox checked/>
      </template>

      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>

 north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue

@@ -73,9 +73,9 @@
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    { type: 'seq',fixed:"left", title: '自序', width: 50 },
    {title: '操作', width: 80, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'checkbox',fixed:"left", title: '基准BOM', width: 110 },
    { type: 'checkbox',fixed:"left", title: '标准BOM', width: 110 },
    { type: 'checkbox',fixed:"left", title: '审核', width: 80 },
    { slots: { default: 'state' }, title: '基准BOM', width: 110 },
    { slots: { default: 'state' }, title: '标准BOM', width: 110 },
    { slots: { default: 'state' }, title: '审核', width: 80 },
    {field: 'customerNumber', width: 120, title: '客户编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
    {field: 'customerName',width: 120, title: '客户名称', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'productNumber', width: 130,title: '产品编号', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -207,6 +207,10 @@
        </ul>
      </template>

      <template #state="{ row}">
        <el-checkbox checked/>
      </template>

      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>

 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue

@@ -270,14 +270,17 @@

<template>
  <div class="main-div-customer">
    <div id="head" style="width: 900px;">
    <div id="head" >
      <el-row :gutter="0">
      <el-date-picker
          v-model="value"
          type="daterange"
          start-placeholder="报工开始时间"
          end-placeholder="结束时间"
      />
      &nbsp;
      <el-button type="primary">查询</el-button>
      </el-row>
    </div>
    <vxe-grid
        max-height="100%"
@@ -321,4 +324,7 @@
  width: 99%;
  height: 100%;
}
#head{
  width:40%;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue

@@ -208,7 +208,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue

@@ -183,7 +183,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue

@@ -204,7 +204,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue

@@ -209,7 +209,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue

@@ -160,7 +160,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue

@@ -203,7 +203,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue

@@ -198,7 +198,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue

@@ -213,7 +213,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue

@@ -218,7 +218,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue

@@ -208,7 +208,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue

@@ -184,7 +184,7 @@
      <el-row :gutter="0">
        <!--        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>-->
        <!--        <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>-->
        &nbsp;&nbsp;

        <el-date-picker
            v-model="form.date1"
            type="daterange"

 north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue

@@ -185,13 +185,16 @@
<template>
  <div class="main-div-customer">
    <div id="head" >
      <el-row :gutter="0">
      <el-date-picker
          v-model="value"
          type="daterange"
          start-placeholder="开始时间"
          end-placeholder="结束时间"
      />
        &nbsp;
      <el-button type="primary">查询</el-button>
      </el-row>
    </div>
    <vxe-grid
        max-height="100%"
@@ -257,4 +260,8 @@
  width: 99%;
  height: 100%;
}
#head{
  width:40%;

}
</style>