代码更新

src/HDrpManagement/contractManage/components/selectAgent.vue

@@ -51,7 +51,7 @@
 
 <script>
 export default {
-	props:['param','radio','checked','type','typemx'],
+	props:['param','radio','checked','type','typemx','sa_projectid'],
   data () {
     return {
       search:'',
@@ -71,6 +71,7 @@ export default {
       this.param.content.where.type = this.type
       this.param.content.where.typemx = this.typemx
 			this.param.content.where.condition = this.search
+      this.param.content.where.sa_projectid = this.sa_projectid || ''
       console.log(this.param)
       const res = await this.$api.requested(this.param)
       this.tableData = res.data

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -34,7 +34,7 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent type="12" ref="member"  :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="12" ref="member" :sa_projectid="form.sa_projectid"  :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -63,7 +63,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -132,7 +132,7 @@
                     trigger="manual"
                     v-model="accountVisible"
                     width="500">
-                  <selectAgent type="11" ref="member"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="11" ref="member" :sa_projectid="form.sa_projectid"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -161,7 +161,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -246,7 +246,7 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent ref="member" type="12"  :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent ref="member" type="12" :sa_projectid="form.sa_projectid"  :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -711,6 +711,9 @@ export default {
          }
        })*/
       console.log(this.payTypeData,'处理后数据')
+    },
+    discountrateChange(){
+      this.form.discountrate = Math.round(this.form.discountrate * 100)/100
     }
   },
   created() {

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

@@ -20,6 +20,8 @@
                     trigger="click"
                     v-model="enterpriseShow"
                     @show="enterpriseList">
+                  <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="enterpriseParam.content.where.condition?enterpriseParam.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="enterpriseParam.content.where.condition" @keyup.native.enter="enterpriseList(enterpriseParam.content.pageNumber = 1)" @clear="enterpriseList(enterpriseParam.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+                  </el-input>
                   <el-table :data="enterprise.enterpriseData" @row-click="enterpriseData" height="400px">
                     <el-table-column
                         label="品牌名称"
@@ -75,7 +77,7 @@
                         :total="enterprise.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择企业名称"   @input="selectEnterprise"></el-input>
+                  <el-input slot="reference" readonly  v-model="form.enterprisename" autocomplete="off" placeholder="请选择企业名称"   @input="selectEnterprise"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -67,7 +67,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目预算(万元):" prop="budgetary">
+              <el-form-item label="项目预算(元):" prop="budgetary">
                 <el-input type="number" v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>

src/components/productTable/indexQty.vue

@@ -128,7 +128,7 @@
       <el-table-column
           prop="qty"
           label="数量"
-          fixed="right"
+
           width="100">
         <template slot-scope="scope">
           <span >{{scope.row.qty?scope.row.qty:'--'}}</span>
@@ -136,7 +136,7 @@
       </el-table-column>
       <el-table-column
           prop="marketprice"
-          fixed="right"
+
           label="牌价"
           width="100">
         <template slot-scope="scope">
@@ -145,7 +145,7 @@
       </el-table-column>
       <el-table-column
           prop="discountrate"
-          fixed="right"
+
           label="折扣(%)"
           width="80">
         <template slot-scope="scope">
@@ -163,7 +163,7 @@
       <el-table-column
           prop="mindiscountrate"
           label="最低授权折扣(%)"
-          fixed="right"
+
           width="80">
         <template slot-scope="scope">
           <span >{{scope.row.mindiscountrate?Math.round((scope.row.mindiscountrate * 100) * 100)/100:'--'}}</span>
@@ -172,7 +172,7 @@
       <el-table-column
           prop="price"
           label="单价"
-          fixed="right"
+
           width="80">
         <template slot-scope="scope">
           <div v-if="(scope.row.discountDifferenceAmount > 0)">
@@ -189,7 +189,7 @@
       <el-table-column
           prop="discountDifferenceAmount"
           label="授权折扣差额"
-          fixed="right"
+
           width="80">
         <template slot-scope="scope">
           <span >{{scope.row.discountDifferenceAmount?scope.row.discountDifferenceAmount:'--'}}</span>