Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/HDrpManagement/ProductMag/modules/add.vue

@@ -137,12 +137,12 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="中线蝶阀">
-                <el-checkbox :true-label="1" :false-label="0" v-model="form.isbutterfly">是否中线蝶阀</el-checkbox>
+                <el-checkbox :true-label="1" :false-label="0" v-model="form.isbutterfly"  >是否中线蝶阀</el-checkbox>
               </el-form-item>
             </el-col>
             
-            <el-col :span="12">
-              <el-form-item label="压力等级">
+            <el-col :span="12" >
+              <el-form-item label="压力等级" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.pressure" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in pressures"
@@ -154,7 +154,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="材质">
+              <el-form-item label="材质" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.material" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in itemmaterial"
@@ -166,7 +166,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="蝶板驱动">
+              <el-form-item label="蝶板驱动" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.butterflyplatedrive" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in butterflyplatedrive"
@@ -178,7 +178,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="连接形式">
+              <el-form-item label="连接形式" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.connection" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in connectionmode"
@@ -190,7 +190,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="阀板材质">
+              <el-form-item label="阀板材质" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.valveplatematerial" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in valveplatematerial"
@@ -202,7 +202,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="阀体材质">
+              <el-form-item label="阀体材质" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.bodymaterial" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in bodymaterial"
@@ -214,7 +214,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="执行器类型">
+              <el-form-item label="执行器类型" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.actuatortype" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in actuatortype"
@@ -226,7 +226,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="执行器品牌">
+              <el-form-item label="执行器品牌" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.actuatorbrand" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in actuatorbrand"
@@ -433,6 +433,7 @@ export default {
       actuatortype:[], // 执行器类型
       actuatorbrand:[],// 执行器品牌
       connectionmode:[],// 连接形式
+
     }
   },
   methods:{

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -142,7 +142,7 @@
             </el-col>
             
             <el-col :span="12">
-              <el-form-item label="压力等级">
+              <el-form-item label="压力等级" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.pressure" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in pressures"
@@ -154,7 +154,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="材质">
+              <el-form-item label="材质" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.material" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in itemmaterial"
@@ -166,7 +166,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="蝶板驱动">
+              <el-form-item label="蝶板驱动" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.butterflyplatedrive" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in butterflyplatedrive"
@@ -178,7 +178,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="连接形式">
+              <el-form-item label="连接形式" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.connection" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in connectionmode"
@@ -190,7 +190,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="阀板材质">
+              <el-form-item label="阀板材质" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.valveplatematerial" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in valveplatematerial"
@@ -202,7 +202,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="阀体材质">
+              <el-form-item label="阀体材质" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.bodymaterial" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in bodymaterial"
@@ -214,7 +214,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="执行器类型">
+              <el-form-item label="执行器类型" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.actuatortype" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in actuatortype"
@@ -226,7 +226,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="执行器品牌">
+              <el-form-item label="执行器品牌" v-if="form.isbutterfly == '1'">
                 <el-select style="width:100%" v-model="form.actuatorbrand" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in actuatorbrand"

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -36,11 +36,14 @@
           <div v-else-if="scope.column.columnname == 'price'">
 <!--            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @input="priceChange($event,scope.column.data)"></el-input>-->
             <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid && scope.column.data.type == '指定单价'" v-model="form.price" @change="priceChange($event,scope.column.data)"></el-input>
-            <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+            <p v-else>{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'countPrice'">
             <p>{{tool.formatAmount(scope.column.data.price * scope.column.data.qty,2)}}</p>
           </div>
+          <div v-else-if="scope.column.columnname == 'marketprice'">
+            <p>{{tool.formatAmount((scope.column.data.marketprice),2)}}</p>
+          </div>
           <div v-else-if="scope.column.columnname == 'brand'">
             {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].brandname}}
           </div>

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -31,10 +31,13 @@
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
             <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @change="priceChange($event,scope.column.data,scope.column.data.index)"></el-input>
-            <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+            <p v-else>{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'countPrice'">
-            <p>{{Math.round((scope.column.data.price * scope.column.data.qty)*100)/100}}</p>
+            <p>{{tool.formatAmount((scope.column.data.price * scope.column.data.qty),2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname == 'marketprice'">
+            <p>{{tool.formatAmount((scope.column.data.marketprice),2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'brand'">
             {{scope.column.data[scope.column.columnname][0] && scope.column.data[scope.column.columnname][0].brandname}}
@@ -131,11 +134,12 @@ export default {
         res.data[index].discountrate = Math.round((res.data[index].discountrate *100)*100)/100
         this.totalPrice = this.totalPrice + res.data[index].amount
       })
-      this.totalPrice = Math.round(this.totalPrice *100)/100
+      this.totalPrice = this.tool.formatAmount(this.totalPrice,2)
       this.list = res.data
       this.total = res.total
       this.$emit('priceChange')
     },
+    /*修改数量*/
     qtyChange (num,data,index) {
       this.form.qty = Math.round(num *100)/100
       data.qty = this.form.qty
@@ -146,15 +150,17 @@ export default {
       console.log(num);
       
     },
+    /*修改备注*/
     remarksChange (val,data,index){
       this.$set(this.list,index,data)
     },
+    /*修改折扣*/
     discountrateChange (num,data,index) {
       console.log(num,data,index)
       if (num>100){
         this.form.discountrate = 100
       }else if (num < 0){
-        this.form.discountrate = 1
+        this.form.discountrate = 0
       }else {
         this.form.discountrate = Math.round(num *100)/100
       }
@@ -162,6 +168,7 @@ export default {
       data.price = this.form.price
       this.$set(this.list,index,data)
     },
+    /*修改价格*/
     priceChange (num,data,index) {
       if (num > data.marketprice){
         this.form.price = data.marketprice

src/HDrpManagement/contractManage/components/toolList/toolList.vue

@@ -27,10 +27,13 @@
           </div>-->
           <div v-else-if="scope.column.columnname == 'price'">
             <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @change="priceChange($event,scope.column.data,scope.column.data.index)"></el-input>
-            <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+            <p v-else>{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'countPrice'">
-            <p>{{Math.round((scope.column.data.price * scope.column.data.qty) *100)/100}}</p>
+            <p>{{tool.formatAmount((scope.column.data.price * scope.column.data.qty),2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname == 'marketprice'">
+            <p>{{tool.formatAmount((scope.column.data.marketprice),2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'brand'">
             {{scope.column.data[scope.column.columnname][0] ? scope.column.data[scope.column.columnname][0].brandname : ''}}
@@ -113,7 +116,7 @@ export default {
       res.data.forEach((e,index)=>{
         this.totalPrice = this.totalPrice + res.data[index].amount
       })
-      this.totalPrice = Math.round(this.totalPrice *100)/100
+      this.totalPrice = this.tool.formatAmount(this.totalPrice,2)
       this.list = res.data
       this.total = res.total
       this.$emit('priceChange')

src/HDrpManagement/contractManage/modules/detail.vue

@@ -559,7 +559,7 @@ export default {
           },
           {
             label:'单套价格(元)',
-            value:this.mainData.signamount?this.mainData.signamount:0
+            value:this.mainData.signamount?this.tool.formatAmount(this.mainData.signamount,2):0
           },
           {
             label:'创建时间',
@@ -1063,7 +1063,7 @@ export default {
                       },
                       {
                         label:'单套价格(元)',
-                        value:this.mainData.signamount?this.mainData.signamount:0
+                        value:this.mainData.signamount?this.tool.formatAmount(this.mainData.signamount,2):0
                       },
                       {
                         label:'状态',

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

@@ -75,6 +75,7 @@
                 @current-change="handleCurrentChange"
                 :current-page="currentPage"
                 :page-sizes="[20, 50, 100, 200]"
+                :page-size="100"
                 layout="total,sizes, prev, pager, next, jumper"
                 :total="total">
               </el-pagination>
@@ -123,7 +124,7 @@ export default {
         content:{
           "isExport":0,
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": "",
             "tablefilter":{}

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          // target: 'http://61.164.207.46:8000',  // target host*/
+          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites