代码提交

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

@@ -167,10 +167,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
+      this.getProductList()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
+      this.getProductList()
     },
   },
 };

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

@@ -162,10 +162,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val
+      this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.params.content.pageNumber = val
+      this.listData()
     },
   },
 };

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/setCustomerType.vue

@@ -64,28 +64,7 @@ export default {
   },
   methods:{
     onSave(){
-      console.log(this.form,"form数据")
-      console.log(this.data,"data数据")
-      if (this.data.type !== '经销商'){
-        if (this.form.type === '经销商'){
-          this.$confirm('是否确定将当前项目改为经销项目?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.onSubmit()
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消删除'
-            });
-          });
-        }else{
-          this.onSubmit()
-        }
-      }else {
-        this.onSubmit()
-      }
+      this.onSubmit()
     },
     onSubmit(){
       this.$refs.form.validate(async(valid) =>{

src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -23,6 +23,13 @@
           <div v-else-if="scope.column.columnname === 'operation'">
             <span>{{scope.column.data[scope.column.columnname]}}</span>
           </div>
+          <div v-else-if="scope.column.columnname === 'enterprisename'">
+            <span v-if="scope.column.data.sa_agentsid === 0">{{scope.column.data[scope.column.columnname]}}</span>
+            <span v-else>
+              {{scope.column.data[scope.column.columnname]}}
+              <el-tag style="margin-left: 5px" type="warning" size="mini">经销商</el-tag>
+            </span>
+          </div>
           <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
         </template>
         <template v-slot:opreation="scope">

src/SDrpManagement/ProductGroup/index.vue

@@ -12,9 +12,9 @@
           @clear="clearData"
           clearable>
       </el-input>
-      <selectPeople ref="people" @selectRow="selectRow">
+      <!-- <selectPeople ref="people" @selectRow="selectRow">
         <el-input clearable @clear="selectRow({enterprisename:'',sys_enterpriseid:''})" v-model="enterprisename" placeholder="请选择经销商/客户" @focus="$refs.people.visible=true" slot="input" size="small"></el-input>
-      </selectPeople>
+      </selectPeople> -->
     </div>
     <selectClass ref="class" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
     <div v-if="Object.keys(productGroup).length > 0">

src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -326,12 +326,12 @@ export default {
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val
+      this.params.content.pageSize = val
       this.productData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.param.content.pageNumber = val
+      this.params.content.pageNumber = val
       this.productData()
     },
     onSuccess(){
@@ -339,11 +339,11 @@ export default {
     },
     clearData(){
       this.search = ""
-      this.param.content.where.condition = this.search
+      this.params.content.where.condition = this.search
       this.productData()
     },
     queryClick(){
-      this.param.content.where.condition = this.search
+      this.params.content.where.condition = this.search
       this.productData()
     },
     selectionChange(val){

src/SDrpManagement/QuotedPrice/components/productTableProject.vue

@@ -327,12 +327,12 @@ export default {
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val
+      this.params.content.pageSize = val
       this.productData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.param.content.pageNumber = val
+      this.params.content.pageNumber = val
       this.productData()
     },
     onSuccess(){
@@ -340,11 +340,11 @@ export default {
     },
     clearData(){
       this.search = ""
-      this.param.content.where.condition = this.search
+      this.params.content.where.condition = this.search
       this.productData()
     },
     queryClick(){
-      this.param.content.where.condition = this.search
+      this.params.content.where.condition = this.search
       this.productData()
     },
     selectionChange(val){

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