代码更新，报价单，收款条件

src/Form/QuotedPrice/edit.vue

@@ -13,17 +13,17 @@
       <div class="drawer__panel" style="margin-bottom: 0px">
         <el-row style="margin-top: 10px" :gutter="10">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="报价类型:" label-width="100px" >
                 <el-input v-model="form.quotedpricetype" autocomplete="off" placeholder="报价类型" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
+            <el-col  :span="8">
               <el-form-item label="是否特价:" label-width="100px" >
                 <el-input  v-model="form.specialoffer === 0?'否':'是'" autocomplete="off" placeholder="是否特价" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6" v-if="isQuotedPrice">
+            <el-col  :span="8" v-if="isQuotedPrice">
               <el-form-item label="项目名称:" label-width="100px" prop="projectname">
                 <el-popover
                     placement="bottom"
@@ -80,12 +80,12 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col :span="6" v-if="isQuotedPrice">
+            <el-col :span="8" v-if="isQuotedPrice">
               <el-form-item label="项目编号:" label-width="100px" >
                 <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="客户名称:" label-width="100px" prop="enterprisename">
                 <el-popover
                     placement="bottom"
@@ -142,17 +142,12 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
+            <el-col  :span="8">
               <el-form-item label="电话:" label-width="100px" >
                 <el-input  v-model="form.telephone" autocomplete="off" placeholder="输入电话" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
-              <el-form-item label="传真:" label-width="100px" >
-                <el-input  v-model="form.fax" autocomplete="off" placeholder="输入传真" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="联系人:" label-width="100px" prop="name">
                 <el-popover
                     placement="bottom"
@@ -216,12 +211,12 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
+            <el-col  :span="8">
               <el-form-item label="联系人手机号:" label-width="100px" >
                 <el-input  v-model="form.contactsphonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
+            <el-col  :span="8">
               <el-form-item label="报价日期:" label-width="100px">
                 <el-date-picker
                     v-model="form.billdate"
@@ -233,10 +228,10 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="有效期:" label-width="100px" >
+            <el-col :span="8">
+              <el-form-item label="有效期:" label-width="100px" prop="date">
                 <el-date-picker
-                    v-model="date"
+                    v-model="form.date"
                     style="width: 100%"
                     type="daterange"
                     value-format="yyyy-MM-dd"
@@ -247,7 +242,33 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-
+            <el-col  :span="8" >
+              <el-form-item label="产品系列:" label-width="100px" prop="itemtype">
+                <el-select
+                    ref="sle"
+                    style="width:100%;"
+                    v-model="form.itemtype"
+                    multiple
+                    placeholder="请选择产品系列"
+                    size="mini"
+                >
+                  <el-option
+                      v-for="item in itemtype"
+                      :key="item.index"
+                      :label="item.value"
+                      :value="item.value"
+                  >
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col  :span="8">
+              <el-form-item label="备注:" label-width="100px" prop="remarks">
+                <el-input  v-model="form.remarks" autocomplete="off" placeholder="请输入备注信息" type="textarea" autosize></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -365,7 +386,10 @@ export default {
         address: "",
         billdate:"",
         enddate:'',
-        begdate:''
+        begdate:'',
+        date:[],
+        itemtype:[],
+        quotedpricenotes:[]
       },
       rules:{
         projectname:[
@@ -374,10 +398,14 @@ export default {
         enterprisename:[
           { required: true, message: '请选择客户', trigger: 'change'},
         ],
+        itemtype:[
+          { required: true, message: '请选择产品系列', trigger: 'change'},
+        ],
        /* name:[
           { required: true, message: '请选择联系人', trigger: 'change'},
         ]*/
       },
+      itemtype:[]
     }
   },
   watch:{
@@ -396,8 +424,8 @@ export default {
     onShow(){
       this.drawer = true
       this.form = Object.assign({},this.form,this.data)
-      this.date[0] = this.form.begdate
-      this.date[1] = this.form.enddate
+      this.form.date[0] = this.form.begdate
+      this.form.date[1] = this.form.enddate
       if (this.form.quotedpricetype === '项目报价'){
         this.isQuotedPrice = true
       }else {
@@ -628,8 +656,15 @@ export default {
       this.projectParam.content.pageNumber = val
       this.contactsList()
     },
+    /*查询产品系列*/
+    queryItemType(){
+      this.$store.dispatch('optiontypeselect','itemtype').then(res => {
+        this.itemtype = res.data
+      })
+    }
   },
   mounted() {
+    this.queryItemType()
   },
   created() {
   }

src/HDrpManagement/ProductMag/detail/index.vue

@@ -10,7 +10,7 @@
         idname="itemid"
         ownertable="plm_item"
         tags=""
-        :tabs="['详细信息','营销分类']"
+        :tabs="['详细信息','营销分类','商品等级价格']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)"
         >
@@ -24,6 +24,9 @@
       <div slot="slot1">
         <saleClass :data="mainData"></saleClass>
       </div>
+      <div slot="slot2">
+        <productPrice ></productPrice>
+      </div>
     </basicDetails>
   </div>
 </template>
@@ -31,6 +34,7 @@
 <script>
 import detail_data from './modules/detailedData'
 import saleClass from '../modules/saleClass.vue'
+import productPrice from '../modules/productPrice'
 export default {
   name: "index",
   data() {
@@ -39,7 +43,7 @@ export default {
       mainAreaData:{}
     }
   },
-  components:{detail_data,saleClass},
+  components:{detail_data,saleClass,productPrice},
   methods: {
     async queryMainData(id) {
       const res = await this.$api.requested({
@@ -114,6 +118,10 @@ export default {
           label:'品名',
           value:this.mainData.erpitemname
         },
+        {
+          label:'牌价',
+          value:this.mainData.marketprice
+        },
       ]
     },
   },

src/HDrpManagement/ProductMag/modules/productPrice.vue

@@ -0,0 +1,49 @@
+<template>
+  <div>
+    <tableLayout :layout="tablecols" :data="list" :custom="true" height="300px" >
+      <template v-slot:customcol="scope">
+        <p >{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+    </tableLayout>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "productPrice",
+  data(){
+    return {
+      tablecols:[],
+      list:[],
+      param:{
+        "id": 20221216134102,
+        "content": {
+          "itemid": '',
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        },
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      this.param.content.itemid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+    }
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['commodityPriceGradeTable'].tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/collectionRule/components/add.vue

@@ -24,8 +24,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注" prop="remarks">
-              <el-input type="textarea" v-model="form.remarks" placeholder="请输入备注"></el-input>
+            <el-form-item label="描述" prop="remarks">
+              <el-input type="textarea" v-model="form.remarks" placeholder="请输入描述"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -77,7 +77,10 @@ export default {
         ],
         isdefault:[
           { required: true, message: '请选择是否默认条件', trigger: 'blur'}
-        ]
+        ],
+        remarks:[
+          { required: true, message: '请输入描述', trigger: 'blur'}
+        ],
       }
     }
   },

src/HDrpManagement/collectionRule/components/edit.vue

@@ -24,7 +24,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注" prop="remarks">
+            <el-form-item label="描述" prop="remarks">
               <el-input type="textarea" v-model="form.remarks" placeholder="请输入备注"></el-input>
             </el-form-item>
           </el-col>
@@ -36,7 +36,7 @@
         </el-form>
       </el-row>
       <div class="dialog-footer">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="dialogFormVisible = false;$refs.form.resetFields()" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-dialog>
@@ -78,7 +78,10 @@ export default {
         ],
         isdefault:[
           { required: true, message: '请选择是否默认条件', trigger: 'blur'}
-        ]
+        ],
+        remarks:[
+          { required: true, message: '请输入描述', trigger: 'blur'}
+        ],
       }
     }
   },

src/HDrpManagement/collectionRule/modules/detail.vue

@@ -74,7 +74,7 @@ export default {
           value:this.mainData.isdefault ? '是' : '否'
         },
         {
-          label:'备注',
+          label:'描述',
           value:this.mainData.remarks
         },
       ]

src/HDrpManagement/collectionRule/modules/table.vue

@@ -9,6 +9,11 @@
         label="收款条件编号"
         width="200">
       </el-table-column>
+      <el-table-column
+          prop="remarks"
+          label="描述"
+          >
+      </el-table-column>
       <el-table-column label="应收款期计算依据">
         <el-table-column
           prop="name"
@@ -16,7 +21,7 @@
           <el-table-column
             prop="point"
             label="订单审核"
-            width="120">
+            width="150">
             <template slot-scope="scope">
               <div v-if="scope.row.point == '订单审核'" style="color: red">是</div>
               <div v-else>--</div>
@@ -25,7 +30,7 @@
           <el-table-column
             prop="amountrate"
             label="立账额度"
-            width="120">
+            width="150">
             <template slot-scope="scope">
               <div v-if="scope.row.point == '订单审核'">{{scope.row.amountrate * 100}}%</div>
               <div v-else>--</div>
@@ -33,9 +38,10 @@
           </el-table-column>
           <el-table-column
             prop="days"
-            label="后置天数">
+            label="后置天数"
+            width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.point == '订单审核'">{{scope.row.days}}%</div>
+              <div v-if="scope.row.point == '订单审核'">{{scope.row.days}}</div>
               <div v-else>--</div>
             </template>
           </el-table-column>
@@ -46,15 +52,16 @@
           <el-table-column
             prop="point"
             label="销售出库审核"
-            width="120">
+            width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.point == '销售出库审核'">√</div>
+              <div v-if="scope.row.point == '销售出库审核'" style="color: red">是</div>
               <div v-else>--</div>
             </template>
           </el-table-column>
           <el-table-column
             prop="days"
-            label="后置天数">
+            label="后置天数"
+            width="150">
             <template slot-scope="scope">
               <div v-if="scope.row.point == '销售出库审核'">{{scope.row.days}}</div>
               <div v-else>--</div>
@@ -66,15 +73,17 @@
           label="发票">
           <el-table-column
             prop="point"
-            label="发票审核">
+            label="发票审核"
+            width="150">
             <template slot-scope="scope">
-              <div v-if="scope.row.point == '发票审核'">√</div>
+              <div v-if="scope.row.point == '发票审核'" style="color: red">是</div>
               <div v-else>--</div>
             </template>
           </el-table-column>
           <el-table-column
             prop="days"
-            label="后置天数">
+            label="后置天数"
+            width="150">
             <template slot-scope="scope">
               <div v-if="scope.row.point == '发票审核'">{{scope.row.days}}</div>
               <div v-else>--</div>

src/HDrpManagement/contractManage/index.vue

@@ -123,7 +123,7 @@
         <span v-if="!scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.data[[scope.data.column.columnname]] !== 0">--</span>
       </template>
       <template v-slot:tbOpreation="scope">
-<!--        <el-button size="mini" @click="$router.push({path:'/directSelling',query:{id:scope.data.data.sa_contractid,sys_enterpriseid:scope.data.data.sys_enterpriseid}})" type="text" >打印</el-button>-->
+        <el-button size="mini" @click="$router.push({path:'/directSelling',query:{id:scope.data.data.sa_contractid,sys_enterpriseid:scope.data.data.sys_enterpriseid}})" type="text" >打印</el-button>
       </template>
     </basicLayout>
   </div>

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -10,20 +10,20 @@
         :show-close="false"
         @close="onClose">
       <div class="drawer__panel" style="margin-bottom: 0px">
-        <el-row style="margin-top: 10px">
+        <el-row style="margin-top: 10px" :gutter="10">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
-            <el-col :span="6">
-              <el-form-item label="报价类型:" label-width="90px" >
+            <el-col :span="8">
+              <el-form-item label="报价类型:" label-width="100px" >
                 <el-input v-model="form.type" autocomplete="off" placeholder="报价类型" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
-              <el-form-item label="是否特价:" label-width="90px" >
+            <el-col  :span="8">
+              <el-form-item label="是否特价:" label-width="100px" >
                 <el-input  v-model="form.specialOffer" autocomplete="off" placeholder="是否特价" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6" >
-              <el-form-item label="项目名称:" label-width="90px" prop="projectname">
+            <el-col  :span="8" >
+              <el-form-item label="项目名称:" label-width="100px" prop="projectname">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -80,13 +80,13 @@
 
               </el-form-item>
             </el-col>
-            <el-col  :span="6" >
-              <el-form-item label="项目编号:" label-width="90px" >
+            <el-col  :span="8" >
+              <el-form-item label="项目编号:" label-width="100px" >
                 <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
-              <el-form-item label="客户名称:" label-width="90px" prop="enterprisename">
+            <el-col  :span="8">
+              <el-form-item label="客户名称:" label-width="100px" prop="enterprisename">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -142,34 +142,13 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col   :span="6">
-              <el-form-item label="报价日期:" label-width="90px">
-                <el-date-picker
-                    v-model="form.billdate"
-                    style="width: 100%"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                    :picker-options="pickerOptions">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="有效期:" label-width="90px" >
-                <el-date-picker
-                    v-model="date"
-                    style="width: 100%"
-                    type="daterange"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :picker-options="pickerOptions">
-                </el-date-picker>
+            <el-col  :span="8">
+              <el-form-item label="电话:" label-width="100px" >
+                <el-input  v-model="form.telephone" autocomplete="off" placeholder="电话" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col   :span="6">
-              <el-form-item label="联系人:" label-width="90px" >
+            <el-col   :span="8">
+              <el-form-item label="联系人:" label-width="100px" >
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -210,7 +189,7 @@
                     </el-table-column>
                     <el-table-column
                         label="地址"
-                        >
+                    >
                       <template slot-scope="scope">
                         <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
                       </template>
@@ -232,11 +211,64 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
-              <el-form-item label="手机号:" label-width="90px" >
+            <el-col  :span="8">
+              <el-form-item label="联系人手机号:" label-width="100px" >
                 <el-input  v-model="form.phonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
               </el-form-item>
             </el-col>
+            <el-col  :span="8">
+              <el-form-item label="报价日期:" label-width="100px">
+                <el-date-picker
+                    v-model="form.billdate"
+                    style="width: 100%"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="有效期:" label-width="100px" prop="date">
+                <el-date-picker
+                    v-model="form.date"
+                    style="width: 100%"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    :picker-options="pickerOptions">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col  :span="8" >
+              <el-form-item label="产品系列:" label-width="100px" prop="itemtype">
+                <el-select
+                    ref="sle"
+                    style="width:100%;"
+                    v-model="form.itemtype"
+                    multiple
+                    placeholder="请选择产品系列"
+                    size="mini"
+                >
+                  <el-option
+                      v-for="item in itemtype"
+                      :key="item.index"
+                      :label="item.value"
+                      :value="item.value"
+                  >
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col  :span="8">
+              <el-form-item label="备注:" label-width="100px" prop="remarks">
+                <el-input  v-model="form.remarks" autocomplete="off" placeholder="请输入备注信息" type="textarea" autosize></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -333,12 +365,14 @@ export default {
       date:[],
       productObj:{},
       form:{
+        date:[],
         totalPrice:'',
         type:'',
         projectnum:'',
         enterprisename:'',
         name:'',
         phonenumber:'',
+        telephone:'',
         specialOffer:'否',
         sa_quotedpriceid:0,     //sat_notice_classid<=0时 为新增
         sys_enterpriseid: "",
@@ -351,7 +385,9 @@ export default {
         address: "",
         billdate:"",
         enddate:'',
-        begdate:''
+        begdate:'',
+        itemtype:[],
+        quotedpricenotes:[]
       },
       rules:{
         projectname:[
@@ -359,8 +395,15 @@ export default {
         ],
         enterprisename:[
           { required: true, message: '请选择客户', trigger: 'change'},
-        ]
+        ],
+        date:[
+          { required: true, message: '请选择有效期', trigger: 'change'},
+        ],
+        itemtype:[
+          { required: true, message: '请选择产品系列', trigger: 'change'},
+        ],
       },
+      itemtype:[]
     }
   },
   methods:{
@@ -377,18 +420,20 @@ export default {
         this.form.begdate = this.date[0]
         this.form.enddate = this.date[1]
       }
+      console.log(this.form,"form")
       this.$refs.form.validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({
           "id": 20221020164803,
-          "version":1,
           "content": this.form
         })
         /*this.$refs.quoterPrice.quoterPrice(res.data.sa_quotedpriceid,this.form.type)
         this.form.sa_quotedpriceid = res.data.sa_quotedpriceid*/
+
         setTimeout(()=>{
           this.$refs.quoterPrice.quoterPrice(res.data.sa_quotedpriceid,this.form.type,type)
           this.form.sa_quotedpriceid = res.data.sa_quotedpriceid
+          console.log(res.data.sa_quotedpriceid)
         },500)
       })
     },
@@ -505,6 +550,7 @@ export default {
       this.form.contactsid = 0
       this.form.name = ''
       this.form.phonenumber = ''
+      this.form.telephone = ''
       this.projectShow = false
     },
     /*客户选择信息*/
@@ -514,6 +560,7 @@ export default {
       this.form.contactsid = 0
       this.form.name = ''
       this.form.phonenumber = ''
+      this.form.telephone = ''
       this.customerShow = false
     },
     /*联系人选择信息*/
@@ -521,6 +568,7 @@ export default {
       this.form.contactsid = val.contactsid
       this.form.name = val.name
       this.form.phonenumber = val.phonenumber
+      this.form.telephone = val.telephone
       this.contactsShow = false
     },
     /*项目分页*/
@@ -556,6 +604,12 @@ export default {
       this.projectParam.content.pageNumber = val
       this.contactsList()
     },
+    /*查询产品系列*/
+    queryItemType(){
+      this.$store.dispatch('optiontypeselect','itemtype').then(res => {
+        this.itemtype = res.data
+      })
+    }
   },
   mounted() {
     const date = new Date()
@@ -564,6 +618,8 @@ export default {
     this.form.projectname = this.data.projectname
     this.form.projectnum = this.data.projectnum
     this.form.type = '项目报价'
+    this.form.sa_quotedpriceid = 0
+    this.queryItemType()
   }
 }
 </script>

src/HManagement/department/modules/add_dep.vue

@@ -50,7 +50,7 @@ export default {
           { required: true, message: '请输入部门名称', trigger: 'blur' },
         ],
         remarks: [
-          { required: true, message: '请输入部门描述', trigger: 'blur' },
+          { required: false, message: '请输入部门描述', trigger: 'blur' },
         ],
         depno: [
           { required: true, message: '请输入部门编号', trigger: 'blur' },

src/HManagement/department/modules/edit_dep.vue

@@ -52,7 +52,7 @@ export default {
           { required: true, message: '请输入部门名称', trigger: 'blur' },
         ],
         remarks: [
-          { required: true, message: '请输入部门描述', trigger: 'blur' },
+          { required: false, message: '请输入部门描述', trigger: 'blur' },
         ],
         depno:[
            { required: true, message: '请输入部门编号', trigger: 'blur' },

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -34,6 +34,9 @@
       <div slot="slot0" class=" normal-panel">
         <productInventory ref="productList" :data="mainData" v-if="flag"></productInventory>
       </div>
+<!--      <div slot="slot2" class=" normal-panel">
+        <otherExpenses></otherExpenses>
+      </div>-->
       <div slot="slot2" class=" normal-panel">
         <historicalQuotation :data="mainData" v-if="flag"></historicalQuotation>
       </div>
@@ -55,6 +58,7 @@ import toVoid from './components/toVoid'
 import historicalQuotation from './modules/historicalQuotation/index'
 import copyTo from "@/SDrpManagement/QuotedPrice/detail/components/copyTo";
 import deApprove from './components/deApprove'
+import otherExpenses from './modules/otherExpenses/index'
 export default {
   name: "index",
   data(){
@@ -82,7 +86,8 @@ export default {
     historicalQuotation,
     copyTo,
     deApprove,
-    revoke
+    revoke,
+    otherExpenses
   },
   watch:{
     mainData(val) {
@@ -131,8 +136,8 @@ export default {
       let that = this
       this.mainAreaData = [
         {
-          label:'客户名称',
-          value:this.mainData.enterprisename
+          label:'报价类型',
+          value:this.mainData.quotedpricetype
         },
         {
           label:'项目编号',
@@ -151,8 +156,8 @@ export default {
           value:this.mainData.begdate?this.mainData.begdate + '至' + this.mainData.enddate:"--"
         },
         {
-          label:'总金额(元)',
-          value:this.totalPrice
+          label:'客户名称',
+          value:this.mainData.enterprisename
         },
         {
           label:'联系人',
@@ -162,6 +167,15 @@ export default {
           label:'手机号',
           value:this.mainData.contactsphonenumber
         },
+
+        {
+          label:'总金额(元)',
+          value:this.totalPrice
+        },
+        {
+          label:'是否特价',
+          value:this.mainData.specialoffer === 1?'是':'否'
+        },
         {
           label:'状态',
           value:this.mainData.status,
@@ -184,10 +198,7 @@ export default {
             
           }
         },
-        {
-          label:'是否特价',
-          value:this.mainData.specialoffer === 1?'是':'否'
-        },
+
         /*{
           label:'邮箱',
           value:this.mainData.email

src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -4,20 +4,29 @@
       <el-descriptions :column="2" labelClassName="my-label" contentClassName="my-content" border>
         <div slot="title" class="my-label__title">基本信息</div>
         <el-descriptions-item label="单号">{{ basic.billno?basic.billno:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="报价类型">{{ basic.quotedpricetype?basic.quotedpricetype:"--" }}</el-descriptions-item>
         <el-descriptions-item label="项目编号">{{ basic.projectnum?basic.projectnum:"--" }}</el-descriptions-item>
         <el-descriptions-item label="项目名称">{{ basic.projectname?basic.projectname:"--"}}</el-descriptions-item>
-        <el-descriptions-item label="项目地址">{{ basic.address?basic.address:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="产品系列">
+          <span v-for="(item,index) in basic.itemtype">
+            {{basic.itemtype.length === 0?item:index === basic.itemtype.length -1?item:item+','}}
+          </span>
+        </el-descriptions-item>
         <el-descriptions-item label="客户">{{ basic.enterprisename?basic.enterprisename:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="负责人">{{ basic.leader.length !== 0?basic.leader[0].name:"--" }}</el-descriptions-item>
         <el-descriptions-item label="电话">{{ basic.telephone?basic.telephone:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="传真">{{ basic.fax?basic.fax:"--" }}</el-descriptions-item>
         <el-descriptions-item label="联系人">{{ basic.contactsname?basic.contactsname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="手机号">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="报价日期">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
         <el-descriptions-item label="有效期">{{ basic.begdate?basic.begdate + '至' + basic.enddate:"--" }}</el-descriptions-item>
-
-        <el-descriptions-item label="备注">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="状态">{{ basic.status?basic.status:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="总金额">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
         <el-descriptions-item label="是否特价">{{ basic.specialoffer === 1?'是':'否' }}</el-descriptions-item>
+        <el-descriptions-item label="状态" >
+          <p :style="colorStyle">{{ basic.status?basic.status:"--" }}</p>
+        </el-descriptions-item>
+        <el-descriptions-item label="负责人">{{ basic.leader.length !== 0?basic.leader[0].name:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="备注">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
+
+
       </el-descriptions>
     </div>
 
@@ -29,10 +38,11 @@
         <!--        <el-descriptions-item label="锁定状态">{{ basic.locked?basic.locked:"&#45;&#45;"}}</el-descriptions-item>-->
         <el-descriptions-item label="最近编辑人">{{ basic.changeby?basic.changeby:"--" }}</el-descriptions-item>
         <el-descriptions-item label="最近编辑时间">{{ basic.changedate?basic.changedate:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="报价人">{{ basic.submitby?basic.submitby:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="报价时间">{{ basic.submitdate?basic.submitdate:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="报价审核">{{ basic.checkby?basic.checkby:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="报价审核时间">{{ basic.checkdate?basic.checkdate:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="提交人">{{ basic.submitby?basic.submitby:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="提交时间">{{ basic.submitdate?basic.submitdate:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="审核人">{{ basic.checkby?basic.checkby:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="审核时间">{{ basic.checkdate?basic.checkdate:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="作废原因">{{ basic.deleteReason[0].deletereason?basic.deleteReason[0].deletereason:'--'}}</el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" label="转手次数">{{ data.leader.length !== 0?data.leader[0].leadernum === 0?'0':data.leader[0].leadernum:'--' }}</el-descriptions-item>
       </el-descriptions>
     </div>
@@ -46,6 +56,9 @@ export default {
   data(){
     return {
       basic:[],
+      colorStyle:{
+        color:''
+      }
     }
   },
   methods:{
@@ -58,11 +71,34 @@ export default {
         }
       })
       this.basic = res.data
+      this.style(this.basic.status)
     },
     detailedList(data){
       console.log("输出")
       console.log(data)
       this.basicData(data.sa_quotedpriceid)
+    },
+    style(val) {
+      let style = {}
+      console.log(val,'执行了')
+      switch (val) {
+        case '新建':
+          style = {color:'#3874f6'}
+          break;
+        case '提交':
+          style = {color:'#52c41a'}
+          break;
+        case '审核':
+          style = {color:'#333333'}
+          break;
+        default:
+          break;
+      }
+      console.log(style)
+      this.colorStyle.color = style.color
+      console.log(this.colorStyle)
+      return style
+
     }
   },
   created() {

src/SDrpManagement/QuotedPrice/detail/modules/otherExpenses/add.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="visible = true">添 加</el-button>
+    <el-drawer
+        title="添加其他费用"
+        :visible.sync="visible"
+        size="800px"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row>
+          <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
+            <el-col :span="24">
+              <el-form-item label="类型" label-width="80px" prop="itemtype">
+                <el-input v-model="form.items[0].itemtype" autocomplete="off" placeholder="请选择类型"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="费用明细" label-width="80px" prop="itemname">
+                <el-input type="textarea"  v-model="form.items[0].itemname" autocomplete="off" placeholder="输入费用明细" autosize></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="单价" label-width="80px" prop="price">
+                <el-input  v-model="form.items[0].price" autocomplete="off" placeholder="请输入单价"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="数量" label-width="80px" prop="qty">
+                <el-input  v-model="form.items[0].qty" autocomplete="off" placeholder="请输入数量"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="单位" label-width="80px" prop="unitname">
+                <el-input  v-model="form.items[0].unitname" autocomplete="off" placeholder="输入选择单位"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="金额" label-width="80px" prop="amount">
+                <el-input  v-model="amount" autocomplete="off"  disabled></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" :disabled="form.items[0].itemtype === '' || form.items[0].itemname === '' || form.items[0].unitname === '' || form.items[0].qty === '' || form.items[0].price === ''"
+                   type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add",
+  data(){
+    return {
+      visible:false,
+      amount:0,
+      form:{
+        "sa_quotedpriceid":475,     //sat_notice_classid<=0时 为新增
+        "items":[
+          {
+            "sa_quotedprice_specialitemsid":0,
+            "itemtype":"",
+            "itemname":"",
+            "unitname":"",
+            "qty":'',
+            "price":''
+          }
+        ]
+      },
+      rules:{
+      },
+    }
+  },
+  methods:{
+    onSubmit(){
+
+    },
+    onClose(){
+      this.visible = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/QuotedPrice/detail/modules/otherExpenses/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div>
+    <div>
+      <add class="inline-16" ></add>
+      <el-input
+          placeholder="请输入搜索内容"
+          :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'"
+          v-model="params.content.where.condition"
+          style="width:200px"
+          size="small"
+          class="input-with-select inline-16"
+          @keyup.native.enter="listData(params.content.pageNumber = 1)"
+          @clear="clearData"
+          clearable>
+      </el-input>
+    </div>
+    <div style="margin-top: 15px">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" fixedName="operation">
+        <template v-slot:customcol="scope">
+          <div v-if="scope.column.columnname === 'province'">
+            <p>{{ scope.column.data.province + '-' + scope.column.data.city + '-' + scope.column.data.county}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'operation'">
+            <span>{{scope.column.data[scope.column.columnname]}}</span>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+        </template>
+        <template v-slot:opreation="scope">
+          <!--          <edit class="inline-16"  :data="scope.data" @updateSuccess="onSuccess" :disabled="rowData.disabled"></edit>-->
+        </template>
+      </tableLayout>
+    </div>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="params.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import add from './add'
+export default {
+  name: "index",
+  components:{add},
+  data(){
+    return {
+      tableHieght:"600px",
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:0,
+      params:{
+        "id": 20230211155603,
+        "content": {
+          "sa_quotedpriceid":this.$route.query.id,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        }
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      const res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+    clearData(){
+      this.params.content.pageNumber = 1
+      this.listData()
+    }
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).otherExpensesTable.tablecols
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -11,17 +11,17 @@
       <div class="drawer__panel" style="margin-bottom: 0px">
         <el-row style="margin-top: 10px" :gutter="10">
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="right">
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="报价类型:" label-width="100px" >
                 <el-input v-model="form.type" autocomplete="off" placeholder="报价类型" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
+            <el-col  :span="8">
               <el-form-item label="是否特价:" label-width="100px" >
                 <el-input  v-model="form.specialOffer" autocomplete="off" placeholder="是否特价" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6" v-if="isQuotedPrice">
+            <el-col  :span="8" v-if="isQuotedPrice">
               <el-form-item label="项目名称:" label-width="100px" prop="projectname">
                 <el-popover
                     placement="bottom"
@@ -79,12 +79,12 @@
 
               </el-form-item>
             </el-col>
-            <el-col  :span="6" v-if="isQuotedPrice">
+            <el-col  :span="8" v-if="isQuotedPrice">
               <el-form-item label="项目编号:" label-width="100px" >
                 <el-input  v-model="form.projectnum" autocomplete="off" placeholder="项目编号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
+            <el-col  :span="8">
               <el-form-item label="客户名称:" label-width="100px" prop="enterprisename">
                 <el-popover
                     placement="bottom"
@@ -141,17 +141,12 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
+            <el-col  :span="8">
               <el-form-item label="电话:" label-width="100px" >
                 <el-input  v-model="form.telephone" autocomplete="off" placeholder="输入电话" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
-              <el-form-item label="传真:" label-width="100px" >
-                <el-input  v-model="form.fax" autocomplete="off" placeholder="输入传真" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col   :span="6">
+            <el-col  :span="8">
               <el-form-item label="联系人:" label-width="100px" prop="name">
                 <el-popover
                     placement="bottom"
@@ -215,12 +210,12 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col  :span="6">
+            <el-col  :span="8">
               <el-form-item label="联系人手机号:" label-width="100px" >
                 <el-input  v-model="form.phonenumber" autocomplete="off" placeholder="手机号" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col   :span="6">
+            <el-col   :span="8">
               <el-form-item label="报价日期:" label-width="100px">
                 <el-date-picker
                     v-model="form.billdate"
@@ -232,10 +227,10 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="有效期:" label-width="100px" >
+            <el-col :span="8">
+              <el-form-item label="有效期:" label-width="100px" prop="date">
                 <el-date-picker
-                    v-model="date"
+                    v-model="form.date"
                     style="width: 100%"
                     type="daterange"
                     value-format="yyyy-MM-dd"
@@ -246,7 +241,33 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-
+            <el-col  :span="8" >
+              <el-form-item label="产品系列:" label-width="100px" prop="itemtype">
+                <el-select
+                    ref="sle"
+                    style="width:100%;"
+                    v-model="form.itemtype"
+                    multiple
+                    placeholder="请选择产品系列"
+                    size="mini"
+                >
+                  <el-option
+                      v-for="item in itemtype"
+                      :key="item.index"
+                      :label="item.value"
+                      :value="item.value"
+                  >
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col  :span="8">
+              <el-form-item label="备注:" label-width="100px" prop="remarks">
+                <el-input  v-model="form.remarks" autocomplete="off" placeholder="请输入备注信息" type="textarea" autosize></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -344,6 +365,7 @@ export default {
       date:[],
       productObj:{},
       form:{
+        date:[],
         totalPrice:'',
         type:'',
         projectnum:'',
@@ -364,7 +386,9 @@ export default {
         address: "",
         billdate:"",
         enddate:'',
-        begdate:''
+        begdate:'',
+        itemtype:[],
+        quotedpricenotes:[]
       },
       rules:{
         projectname:[
@@ -373,10 +397,17 @@ export default {
         enterprisename:[
           { required: true, message: '请选择客户', trigger: 'change'},
         ],
+        date:[
+          { required: true, message: '请选择有效期', trigger: 'change'},
+        ],
+        itemtype:[
+          { required: true, message: '请选择产品系列', trigger: 'change'},
+        ],
         /*name:[
           { required: true, message: '请选择联系人', trigger: 'change'},
         ]*/
       },
+      itemtype:[]
     }
   },
   methods:{
@@ -404,6 +435,7 @@ export default {
         setTimeout(()=>{
           this.$refs.quoterPrice.quoterPrice(res.data.sa_quotedpriceid,this.form.type,type)
           this.form.sa_quotedpriceid = res.data.sa_quotedpriceid
+
         },500)
       })
     },
@@ -575,6 +607,12 @@ export default {
       this.projectParam.content.pageNumber = val
       this.contactsList()
     },
+    /*查询产品系列*/
+    queryItemType(){
+      this.$store.dispatch('optiontypeselect','itemtype').then(res => {
+        this.itemtype = res.data
+      })
+    }
     /*isSpecial(val){
       console.log("获取")
       console.log(val,'是否特价')
@@ -595,6 +633,7 @@ export default {
     const date = new Date()
     this.form.billdate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
     this.form.sa_quotedpriceid = 0
+    this.queryItemType()
   },
   created() {
 

src/template/contractModel/DirectSelling.vue

@@ -6,42 +6,42 @@
     <div id="directSelling">
       <div style="text-align: center;font-size: 24px">{{information.title}}</div>
       <div class="normal-panel container">
-        <div>
+        <div class="div-height">
           <span class="font-bold font-bold-size">甲方（供方）：</span>
           <span>{{clauseData.parta.enterprisename}}</span>
         </div>
-        <div>
+        <div class="div-height">
           <span class="font-bold font-bold-size">乙方（需方）：</span>
           <span>{{clauseData.partb.enterprisename}}</span>
         </div>
-        <div>
+        <div class="div-height">
           <span class="font-bold font-bold-size">合同编号：</span>
           <span>{{information.billno}}</span>
         </div>
-        <div>
+        <div class="div-height">
           <span class="font-bold font-bold-size">签约地点：</span>
           <span>{{clauseData.partb.address}}</span>
         </div>
-        <div style="height: 20px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;甲乙双方在平等，自愿的基础上就班尼戈Conex|Bänninger品牌的阀门购销事宜达成一致意见,现依据《中华人民共和国民法典》的有关规定，特签定本合同，以共同遵守。</div>
+        <div class="div-height">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;甲乙双方在平等，自愿的基础上就班尼戈Conex|Bänninger品牌的阀门购销事宜达成一致意见,现依据《中华人民共和国民法典》的有关规定，特签定本合同，以共同遵守。</div>
       </div>
       <div class="container">
-        <div>
+        <div class="div-height">
           <span class="font-bold-size font-bold">第一条</span>
           <span class="font-bold-size title-margin" >基本要求：</span>
         </div>
-        <div>
+        <div class="div-height">
           1.工程名称：{{information.projectname}}
         </div>
-        <div>
+        <div class="div-height">
           2.工程地址：{{information.province +  information.city + information.county +information.address}}
         </div>
-        <div>
+        <div class="div-height">
           <span>
             3.收货人：{{information.name}}
           </span>
           <span style="margin-left: 40px">联系电话：{{information.phonenumber}}</span>
         </div>
-        <div>
+        <div style="height: 40px">
           <el-row>
             <el-col :span="1.5">
               <div>
@@ -55,7 +55,7 @@
             </el-col>
           </el-row>
         </div>
-        <div style="margin-top: 10px;margin-left: 10px">
+        <div style="margin-top: 10px;margin-left: 10px" class="div-height">
           <el-row>
             <el-col :span="1.5">
               <div>
@@ -69,7 +69,7 @@
             </el-col>
           </el-row>
         </div>
-        <div style="margin-top: 10px;margin-left: 10px">
+        <div style="margin-top: 10px;margin-left: 10px" class="div-height">
           <el-row>
             <el-col :span="1.5">
               <div>
@@ -83,27 +83,27 @@
             </el-col>
           </el-row>
         </div>
-        <div style="margin-top: 10px">
+        <div style="margin-top: 10px" class="div-height">
           剩余货款后的3个工作日内安排发货。
         </div>
-        <div>
+        <div class="div-height">
           <span class="font-bold-size font-bold">第二条</span>
           <span class="font-bold-size title-margin" >货物的名称、规格、数量及供应货款金额：</span>
         </div>
-        <div class="title-marginF">
+        <div class="title-marginF div-height">
           1. 货物采购明细表：（见附件）
         </div>
-        <div class="title-marginF">
+        <div class="title-marginF div-height">
           2. 订单货款金额：人民币（大写）
         </div>
-        <div style="margin-left: 190px">
+        <div style="margin-left: 190px" class="div-height">
           （小写）（含13%增值税专用发票）
         </div>
-        <div class="title-marginF">
+        <div class="title-marginF div-height">
           3. 产品参数请对照“货物采购明细表”内的型号及备注，可查阅http://www.ibpchina.com相关样
           册或使用说明书（定制或者产品升级，以双方确认的参数为准）；
         </div>
-        <div class="title-marginF">
+        <div class="title-marginF div-height">
           <el-row>
             <el-col :span="4.5">
               <div>
@@ -117,15 +117,15 @@
             </el-col>
           </el-row>
         </div>
-        <div>
+        <div class="div-height">
           <span class="font-bold-size font-bold">第三条</span>
           <span class="font-bold-size title-margin" >甲方对质量负责的条件及期限:产品出厂之日起24个月。</span>
         </div>
-        <div>
+        <div class="div-height">
           <span class="font-bold-size font-bold">第四条</span>
           <span class="font-bold-size title-margin" >验收标准、方法及期限:按国家标准验收,水压试验；乙方受领货物后，应立即对货物的数量、型号、规格等进行验收；数量、型号、规格等存在差异的，乙方应在收到货物后七（7）日内提出，否则视同乙方已验收货物且对数量、型号、规格等无异议。</span>
         </div>
-        <div>
+        <div class="div-height">
           <span class="font-bold-size title-margin" >
             <el-row>
             <el-col :span="4.5">
@@ -226,4 +226,7 @@ export default {
   .size-span {
     font-size: 14px;
   }
+  .div-height{
+    /*margin-top: 10px;*/
+  }
 </style>