Browse Source

统一页面风格

chenrui 4 years ago
parent
commit
c8128d330c

+ 3 - 3
src/views/allocationManagement/chainTransferOut/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增连锁调出单"
     title="新增连锁调出单"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow = false"
     @cancle="isShow = false"
-    width="80%">
+    :width="800">
     <a-form-model
     <a-form-model
       id="chainTransferOut-basicInfo-form"
       id="chainTransferOut-basicInfo-form"
       ref="ruleForm"
       ref="ruleForm"
@@ -65,8 +65,8 @@ export default {
     return {
     return {
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       formItemLayout: {
       formItemLayout: {
-        labelCol: { span: 6 },
-        wrapperCol: { span: 16 }
+        labelCol: { span: 4 },
+        wrapperCol: { span: 18 }
       },
       },
       form: {
       form: {
         allocationType: '', // 调出产品类型
         allocationType: '', // 调出产品类型

+ 3 - 3
src/views/allocationManagement/storeTransferOut/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增店内调出单"
     title="新增店内调出单"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow = false"
     @cancle="isShow = false"
-    width="80%">
+    :width="800">
     <a-form-model
     <a-form-model
       id="storeTransferOut-basicInfo-form"
       id="storeTransferOut-basicInfo-form"
       ref="ruleForm"
       ref="ruleForm"
@@ -71,8 +71,8 @@ export default {
     return {
     return {
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       formItemLayout: {
       formItemLayout: {
-        labelCol: { span: 6 },
-        wrapperCol: { span: 16 }
+        labelCol: { span: 4 },
+        wrapperCol: { span: 18 }
       },
       },
       form: {
       form: {
         putPersonType: 'CUSTOMER',
         putPersonType: 'CUSTOMER',

+ 5 - 5
src/views/allocationManagement/warehouseAllocation/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增"
     title="新增"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow = false"
     @cancle="isShow = false"
-    width="80%">
+    :width="800">
     <a-form-model
     <a-form-model
       id="warehouseAllocation-basicInfo-form"
       id="warehouseAllocation-basicInfo-form"
       ref="ruleForm"
       ref="ruleForm"
@@ -67,16 +67,16 @@ export default {
       if (!newValue) {
       if (!newValue) {
         this.$emit('close')
         this.$emit('close')
       } else {
       } else {
-		  this.getWarehouseList()
-	  }
+        this.getWarehouseList()
+      }
     }
     }
   },
   },
   data () {
   data () {
     return {
     return {
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       formItemLayout: {
       formItemLayout: {
-        labelCol: { span: 6 },
-        wrapperCol: { span: 16 }
+        labelCol: { span: 4 },
+        wrapperCol: { span: 18 }
       },
       },
       form: {
       form: {
         outWarehouseSn: undefined, // 调出仓库
         outWarehouseSn: undefined, // 调出仓库

+ 3 - 3
src/views/bulkManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增散件入库单"
     title="新增散件入库单"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
-    width="80%">
+    :width="800">
     <a-form-model
     <a-form-model
       id="bulkWarehousingOrder-basicInfo-form"
       id="bulkWarehousingOrder-basicInfo-form"
       ref="ruleForm"
       ref="ruleForm"
@@ -70,8 +70,8 @@ export default {
     return {
     return {
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       formItemLayout: {
       formItemLayout: {
-        labelCol: { span: 6 },
-        wrapperCol: { span: 16 }
+        labelCol: { span: 4 },
+        wrapperCol: { span: 18 }
       },
       },
       form: {
       form: {
         supplierSn: undefined, // 供应商
         supplierSn: undefined, // 供应商

+ 5 - 2
src/views/customerManagement/customerInfo/detailModal.vue

@@ -7,10 +7,10 @@
     title="客户详情"
     title="客户详情"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <!-- 客户详情 -->
     <!-- 客户详情 -->
     <div>
     <div>
-      <a-descriptions :column="3" bordered v-if="detailData">
+      <a-descriptions :column="3" bordered size="small" v-if="detailData">
         <a-descriptions-item label="客户名称:">{{ detailData.customerName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="客户名称:">{{ detailData.customerName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="联系人:">{{ detailData.contactName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="联系人:">{{ detailData.contactName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="联系电话:">{{ detailData.contactTel || '--' }}</a-descriptions-item>
         <a-descriptions-item label="联系电话:">{{ detailData.contactTel || '--' }}</a-descriptions-item>
@@ -98,6 +98,9 @@ export default {
     .ant-modal-body {
     .ant-modal-body {
       padding: 40px 40px 24px;
       padding: 40px 40px 24px;
     }
     }
+    .ant-descriptions-item-label.ant-descriptions-item-colon{
+      width: 145px;
+    }
     .item-cont {
     .item-cont {
       margin-bottom: 15px;
       margin-bottom: 15px;
       display: flex;
       display: flex;

+ 2 - 2
src/views/customerManagement/customerInfo/edit.vue

@@ -142,8 +142,8 @@ export default {
   data () {
   data () {
     return {
     return {
       formItemLayout: {
       formItemLayout: {
-        labelCol: { span: 8 },
-        wrapperCol: { span: 16 }
+        labelCol: { span: 9 },
+        wrapperCol: { span: 15 }
       },
       },
       form: {
       form: {
         id: null,
         id: null,

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue

@@ -7,7 +7,7 @@
     title="全部单据"
     title="全部单据"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 5 - 5
src/views/financialManagement/expenseManagement/detailModal.vue

@@ -46,11 +46,11 @@ export default {
     //  获取详情
     //  获取详情
     getDetail () {
     getDetail () {
       findExpenseDetail({ id: this.itemId }).then(res => {
       findExpenseDetail({ id: this.itemId }).then(res => {
-      	if (res.status == 200) {
-      		this.detailsData = res.data
-      	} else {
-      		this.detailsData = null
-      	}
+        if (res.status == 200) {
+          this.detailsData = res.data
+        } else {
+          this.detailsData = null
+        }
       })
       })
     }
     }
   },
   },

+ 1 - 1
src/views/financialManagement/expenseManagement/list.vue

@@ -103,7 +103,7 @@
           class="button-error"
           class="button-error"
           @click="handleDel(record)"
           @click="handleDel(record)"
           id="expenseManagement-del-btn">删除</a-button>
           id="expenseManagement-del-btn">删除</a-button>
-        <span v-if="record.state == 'AUDIT_ACCESS'">--</span>
+        <span v-if="record.state != 'WAIT_AUDIT'">--</span>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 详情 -->
     <!-- 详情 -->

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -7,7 +7,7 @@
     :title="modalTit"
     :title="modalTit"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div class="ftext" slot="message">现有库存总数量(个):<strong>{{ currentStock.currentQty || 0 }}</strong>;现有库存总成本(¥):<strong>{{ currentStock.putCost || 0 }}</strong>。</div>
       <div class="ftext" slot="message">现有库存总数量(个):<strong>{{ currentStock.currentQty || 0 }}</strong>;现有库存总成本(¥):<strong>{{ currentStock.putCost || 0 }}</strong>。</div>
@@ -128,7 +128,7 @@ export default {
   .inventoryQueryDetail-modal{
   .inventoryQueryDetail-modal{
     .btn-cont {
     .btn-cont {
       text-align: center;
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 5px 0 10px;
     }
     }
   }
   }
 </style>
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -71,7 +71,7 @@
       <s-table
       <s-table
         class="sTable"
         class="sTable"
         ref="table"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :rowKey="(record) => record.id"
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"

+ 1 - 1
src/views/notice/detailModal.vue

@@ -7,7 +7,7 @@
     title="公告详情"
     title="公告详情"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
-    width="80%">
+    :width="800">
     <div v-if="detailsData">
     <div v-if="detailsData">
       <a-descriptions bordered size="small" :column="2">
       <a-descriptions bordered size="small" :column="2">
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>

+ 5 - 2
src/views/productManagement/productInfo/detailModal.vue

@@ -7,10 +7,10 @@
     title="产品详情"
     title="产品详情"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
-    width="80%">
+    :width="800">
     <!-- 产品详情 -->
     <!-- 产品详情 -->
     <div v-if="detailsData">
     <div v-if="detailsData">
-      <a-descriptions bordered size="default">
+      <a-descriptions bordered :column="2" size="small">
         <a-descriptions-item label="产品名称:">{{ detailsData.name || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品名称:">{{ detailsData.name || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品编码:">{{ detailsData.code || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品编码:">{{ detailsData.code || '--' }}</a-descriptions-item>
         <a-descriptions-item label="原厂编码:">{{ detailsData.origCode || '--' }}</a-descriptions-item>
         <a-descriptions-item label="原厂编码:">{{ detailsData.origCode || '--' }}</a-descriptions-item>
@@ -91,6 +91,9 @@ export default {
     .ant-modal-body {
     .ant-modal-body {
       padding: 40px 40px 24px;
       padding: 40px 40px 24px;
     }
     }
+    .ant-descriptions-item-label.ant-descriptions-item-colon{
+      width: 120px;
+    }
     .btn-cont {
     .btn-cont {
       text-align: center;
       text-align: center;
       margin: 35px 0 10px;
       margin: 35px 0 10px;

+ 3 - 3
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增采购单"
     title="新增采购单"
     v-model="isShow"
     v-model="isShow"
     @cancel="cancel"
     @cancel="cancel"
-    width="50%">
+    :width="800">
     <a-form-model
     <a-form-model
       id="purchaseOrder-basicInfo-form"
       id="purchaseOrder-basicInfo-form"
       ref="ruleForm"
       ref="ruleForm"
@@ -67,8 +67,8 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       settleStyleList: [], // 支付方式
       settleStyleList: [], // 支付方式
       formItemLayout: {
       formItemLayout: {
-        labelCol: { span: 6 },
-        wrapperCol: { span: 16 }
+        labelCol: { span: 4 },
+        wrapperCol: { span: 18 }
       },
       },
       form: {
       form: {
         purchaseTragetType: '', // 供应商
         purchaseTragetType: '', // 供应商

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -7,7 +7,7 @@
     title="收货地址"
     title="收货地址"
     v-model="isShow"
     v-model="isShow"
     @cancel="isShow=false"
     @cancel="isShow=false"
-    width="70%">
+    :width="900">
     <!-- 操作按钮 -->
     <!-- 操作按钮 -->
     <div class="table-operator">
     <div class="table-operator">
       <a-button id="chooseAddressList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       <a-button id="chooseAddressList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
@@ -97,7 +97,7 @@ export default {
         { title: '收货人', scopedSlots: { customRender: 'consignee' }, align: 'center', ellipsis: true },
         { title: '收货人', scopedSlots: { customRender: 'consignee' }, align: 'center', ellipsis: true },
         { title: '手机号码', dataIndex: 'consigneeTel', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '手机号码', dataIndex: 'consigneeTel', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货地址', dataIndex: 'address', width: 400, align: 'center', ellipsis: true },
         { title: '收货地址', dataIndex: 'address', width: 400, align: 'center', ellipsis: true },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' },
         { title: '选择', scopedSlots: { customRender: 'choose' }, width: 100, align: 'center', fixed: 'right' }
         { title: '选择', scopedSlots: { customRender: 'choose' }, width: 100, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/receivingAddress/editAddressModal.vue

@@ -7,7 +7,7 @@
     title="收货地址"
     title="收货地址"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
-    width="65%">
+    :width="800">
     <a-form-model
     <a-form-model
       id="editAddress-form"
       id="editAddress-form"
       ref="ruleForm"
       ref="ruleForm"
@@ -91,7 +91,7 @@ export default {
       isEdit: false,
       isEdit: false,
       formItemLayout: {
       formItemLayout: {
         labelCol: { span: 4 },
         labelCol: { span: 4 },
-        wrapperCol: { span: 16 }
+        wrapperCol: { span: 18 }
       },
       },
       form: {
       form: {
         consigneeName: '',
         consigneeName: '',

+ 1 - 1
src/views/salesManagement/quotation/basicInfoModal.vue

@@ -23,7 +23,7 @@
         </a-auto-complete>
         </a-auto-complete>
       </a-form-model-item>
       </a-form-model-item>
       <a-form-model-item label="价格类型" prop="priceType">
       <a-form-model-item label="价格类型" prop="priceType">
-      	<v-select code="PRICE_TYPE" id="quotation-basicInfo-priceType" v-model="form.priceType" allowClear placeholder="请选择价格类型" ></v-select>
+        <v-select code="PRICE_TYPE" id="quotation-basicInfo-priceType" v-model="form.priceType" allowClear placeholder="请选择价格类型" ></v-select>
       </a-form-model-item>
       </a-form-model-item>
       <a-form-model-item label="电话" prop="phone">
       <a-form-model-item label="电话" prop="phone">
         <a-input id="quotation-basicInfo-bundleName" v-model="form.bundleName" allowClear :maxLength="30" placeholder="请输入电话(最多30个字符)"/>
         <a-input id="quotation-basicInfo-bundleName" v-model="form.bundleName" allowClear :maxLength="30" placeholder="请输入电话(最多30个字符)"/>

+ 2 - 2
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -5,7 +5,7 @@
     centered
     centered
     :maskClosable="false"
     :maskClosable="false"
     :confirmLoading="confirmLoading"
     :confirmLoading="confirmLoading"
-    width="80%"
+    :width="960"
     :footer="null"
     :footer="null"
     @cancel="cancel"
     @cancel="cancel"
   >
   >
@@ -182,7 +182,7 @@
       v-model="isNewCust"
       v-model="isNewCust"
       title="新增客户"
       title="新增客户"
       centered
       centered
-      width="60%"
+      :width="960"
       :maskClosable="false"
       :maskClosable="false"
       @cancel="cancelNewCust"
       @cancel="cancelNewCust"
       :footer="null"
       :footer="null"

+ 1 - 1
src/views/salesManagement/salesQuery/productSalesRecordModal.vue

@@ -7,7 +7,7 @@
     :title="modalTit"
     :title="modalTit"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <div>
     <div>
       <a-tabs size="small" type="card" v-model="curTab" @change="callback">
       <a-tabs size="small" type="card" v-model="curTab" @change="callback">
         <a-tab-pane key="1" tab="当前客户">
         <a-tab-pane key="1" tab="当前客户">

+ 1 - 1
src/views/salesManagement/salesReturn/chooseCustomModal.vue

@@ -5,7 +5,7 @@
     centered
     centered
     :maskClosable="false"
     :maskClosable="false"
     :confirmLoading="confirmLoading"
     :confirmLoading="confirmLoading"
-    width="80%"
+    :width="960"
     :footer="null"
     :footer="null"
     @cancel="cancel"
     @cancel="cancel"
   >
   >