Pārlūkot izejas kodu

报价单、商品调价单样式调整

qymljy 9 mēneši atpakaļ
vecāks
revīzija
862b74f55a

+ 1 - 32
src/Form/QuotedPrice/add.vue

@@ -1,44 +1,13 @@
 <template>
   <div>
     <el-dropdown :hide-on-click="false" @command="handleCommand">
-      <el-button size="small" type="primary" >{{$t('新 建')}}</el-button>
+      <el-button size="small" type="primary">{{$t('新 建')}}</el-button>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="项目报价">{{ $t('项目报价') }}</el-dropdown-item>
         <el-dropdown-item command="客户报价">{{ $t('客户报价') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
 
-<!--    <el-dialog
-        :title="$t(`创建报价单`)"
-        :visible.sync="dialogFormVisible"
-        width="25%"
-        append-to-body
-        @close="onCancel"
-    >
-      <div class="panel_Target" >
-        <el-row style="margin-top: 3%">
-          <el-col :span="4" :offset="1">
-            <div style="width: 100%;text-align: right">
-              <label class="normal-margin inline-16" style="margin-top: 8%">报价单类型:</label>
-            </div>
-          </el-col>
-          <el-col :span="18">
-            <el-select v-model="type" :placeholder="$t('请选择')" size="small" style="width: 90%">
-              <el-option
-                  v-for="item in options"
-                  :key="item.label"
-                  :label="$t(item.label)"
-                  :value="item.label">
-              </el-option>
-            </el-select>
-          </el-col>
-        </el-row>
-      </div>
-      <div class="dialog-footer ">
-        <el-button size="small" @click="onCancel" class="normal-btn-width">{{$t('取 消')}}</el-button>
-        <el-button size="small" type="primary"  @click="onSubmit" class="normal-btn-width">{{$t('确 定')}}</el-button>
-      </div>
-    </el-dialog>-->
     <projec_quotation_add :drawerShow="drawerShow" v-if="drawerShow" :typeData="type" @addSuccess="onSuccess"></projec_quotation_add>
   </div>
 </template>

+ 2 - 2
src/HDrpManagement/productMoneyOdd/modules/productOddDetail.vue

@@ -42,7 +42,7 @@
           nameId="202212003011904"
           nameKey="sa_itempriceadjustid"
         />
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="400px">
+    <table-new-layout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="calc(100vh - 385px)" minHeight="200px">
       <template v-slot:customcol="scope">
         <p>{{$t(scope.column.data[scope.column.columnname])}}</p>
       </template>
@@ -58,7 +58,7 @@
           nameKey="sa_itempriceadjust_itemsids"
         />
       </template>
-    </tableLayout>
+    </table-new-layout>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
         background

+ 1 - 1
src/SDrpManagement/QuotedPrice/index.vue

@@ -19,7 +19,7 @@
     >
       <template #titleRight>
         <div>
-          <exportFile :param="param" fileName="报价单" :style="{marginLeft:siteid == 'HY'?'-10px':''}"></exportFile>
+          <exportFile :param="param" fileName="报价单" ></exportFile>
         </div>
       </template>
       <template #custom>

+ 1 - 1
src/components/normal-basic-layout/index.vue

@@ -24,7 +24,7 @@
               <!-- <el-button class="inline-16" size="small" type="primary" plain>{{$t('导 入')}}</el-button> -->
               <excel class="inline-16" :tablecols="layout" :param="param" :total="total" :specialKey="specialKey" :excelTitle="routerName" v-if="exports" :exportName="exportName" :exportValue="exportValue" :exporAdd="exporAdd"></excel>
               <exportFile :columns="columns" :param="param" :fileName="fileName" v-if="isNewExport" class="inline-16" ></exportFile>
-              <reportCenter :btnName="$t('报 表')" class="inline-16" position="detail" size="small" :data="reportCenterLsit.filter(item => item.type == 'datainfo')" v-if="reportCenterLsit.filter(item => item.type == 'datainfo').length > 0 && systemappid != 163">
+              <reportCenter :btnName="$t('报 表')"  position="detail" size="small" :data="reportCenterLsit.filter(item => item.type == 'datainfo')" v-if="reportCenterLsit.filter(item => item.type == 'datainfo').length > 0 && systemappid != 163">
                 <template v-slot:print="scope2">
                   <el-button @click="printBtn({},scope2.data)" type="text" size="mini">{{$t('打 印')}}</el-button>
                 </template>

+ 1 - 1
src/components/normal-basic-layout/reportCenter/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true" v-if="($route.name === 'quotedprice' && status === '审核') || $route.name !== 'quotedprice'">{{ btnName ? $t(btnName) : $t('导 出') }}</el-button>
+    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true" v-if="($route.name === 'quotedprice' && status === '审核') || $route.name !== 'quotedprice'" class="inline-16">{{ btnName ? $t(btnName) : $t('导 出') }}</el-button>
     <el-drawer
     :visible.sync="drawer"
     :with-header="false"