Merge remote-tracking branch 'remotes/origin/martekSort'

src/views/modules/shop/bookmarketingtags.vue

@@ -43,7 +43,7 @@
           </div>
         </div>
         <commonShop :currentId="addForm.id ? addForm.id : ''" currentType="bookMarketId" :dataList="associatedGoodsList"
-          :urlList="urlList" @delete="dataFormDelete" :isEdit="isEdit" ref="commonShop" :style="`height: calc(100% - 50px); `"></commonShop>
+          :urlList="urlList" @delete="dataFormDelete" :isEdit="isEdit" :oprateType="oprateType" ref="commonShop" :style="`height: calc(100% - 50px); `"></commonShop>
         <!-- <div class="submitButtonBox" v-if="isEdit">
           <el-checkbox v-model="checkAll" @change="handleCheckAllChange" style="float: left">全选</el-checkbox>
 
@@ -107,6 +107,7 @@ export default {
         add: "/book/labelAndMarket/saveOrUpdateMarket",
         getAssociatedGoodsList: "/book/labelAndMarket/getToMarketList",
       },
+      oprateType:"yingxiao", // yingxiao：类型是营销         fenlei:类型是分类
       addForm: {},
       isFresh: false,
       dataRule: {

src/views/modules/shop/commonBookTags/shopproduct.vue

@@ -124,7 +124,24 @@
             sortable
             label="价格"
           >
-          </el-table-column>
+          </el-table-column>  
+          <el-table-column v-if="oprateType=='yingxiao'" 
+           prop="sort"           
+            width="120"
+            header-align="center"
+            align="center"            
+            label="排序( 双击修改 )"
+          >
+          <template slot-scope="scope">
+            <div class="paixu"  @dblclick="myDbClick(scope.row)">
+            <span v-show="!scope.row.isEdit">{{scope.row.sort}}</span>
+            <div class="inputBox" v-show="scope.row.isEdit">
+              <el-input  @keyup.enter.native="changeSort(scope.row)" min="0" @blur="changeSort(scope.row)"  v-model.number="scope.row.sort"  ></el-input>
+             <el-tag type="danger" size="mini" @click="cancelBtn(scope.row)">×</el-tag>
+            </div>  
+          </div>            
+          </template>
+          </el-table-column>        
           <el-table-column
             prop="product.activityPrice"
             width="120"
@@ -240,7 +257,7 @@
 // import chooseBook from './chooseBook.vue'
 // import AddOrUpdate from './shopproduct-add-or-update'
 export default {
-  props: ["urlList", "isEdit", "currentId", "currentType"],
+  props: ["urlList", "isEdit", "currentId", "currentType",'oprateType'],
   data() {
     return {
       multipleSelectionAll: [], // 所有选中的数据包含跨页数据
@@ -264,6 +281,7 @@ export default {
       dataForm: {
         productName: "",
       },
+      oldSort:0,   
     };
   },
   watch: {
@@ -292,6 +310,51 @@ export default {
     shopDelete(row){
 this.$emit('delete',[row])
     },
+    cancelBtn(row){
+      row.isEdit = false 
+      this.oldSort = 0
+      if(row.sort == ""){row.sort = 0}
+    },
+    changeSort(row){ // 确认排序   
+      if(this.oldSort == row.sort)   {return}
+      if(row.sort == ""){row.sort = 0}
+      row.isEdit = false  
+      // console.log(row)
+      // return false  
+      var url = ""
+      if(this.oprateType == "yingxiao"){
+        url = "/book/labelAndMarket/editMarketSort"
+      }else{
+        return
+      }
+      console.log(url,this.oprateType)      
+      this.$http
+          .request({
+            url: this.$http.adornUrl(url),
+            method: "POST",
+            data: {
+              "id": row.id,
+               "sort": row.sort
+            },
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json"
+            }
+          })
+      .then(({ data }) => {
+        if(data.code == 0 && data.msg == "success"){
+         
+          this.getAssociatedGoodsList()
+          this.oldSort = 0
+       // console.log(this.oldSort,'复原')
+        }       
+      });
+    },
+    myDbClick(row){ // 双击修改排序      
+      this.oldSort = row.sort
+      console.log(this.oldSort,88888888)
+      row.isEdit = true      
+    },
     // 获取商品类型
     getGoodsTypeList() {
       this.$http({
@@ -416,9 +479,15 @@ this.$emit('delete',[row])
         }),
       }).then(async ({ data }) => {
         if (data && data.code === 0) {
-          this.associatedGoodsList = [...data.result.records];
+          var list = [...data.result.records];
+          // this.associatedGoodsList = [...data.result.records];
 
           this.dataListLoading = false;
+          
+          list.forEach((item) => {
+            item.isEdit = false
+          })
+          this.associatedGoodsList = list  
         }
       });
     },
@@ -515,6 +584,10 @@ this.$emit('delete',[row])
 
 
 <style lang="less" scoped>
+.paixu{cursor: pointer;}
+.inputBox{display: flex; align-items:center;
+  .el-input{margin-right: 5px;}
+}
 li {
   padding: 0;
   margin: 0;

src/views/modules/shop/commonMedicineTags/shopproduct.vue

@@ -125,6 +125,23 @@
             label="价格"
           >
           </el-table-column>
+          <el-table-column v-if="oprateType=='yingxiao'" 
+           prop="sort"           
+            width="120"
+            header-align="center"
+            align="center"            
+            label="排序( 双击修改 )"
+          >
+          <template slot-scope="scope">
+            <div class="paixu"  @dblclick="myDbClick(scope.row)">
+            <span v-show="!scope.row.isEdit">{{scope.row.sort}}</span>
+            <div class="inputBox" v-show="scope.row.isEdit">
+              <el-input @keyup.enter.native="changeSort(scope.row)" min="0" @blur="changeSort(scope.row)"  v-model="scope.row.sort"  ></el-input>
+             <el-tag type="danger" size="mini" @click="cancelBtn(scope.row)">×</el-tag>
+            </div>  
+          </div>            
+          </template>
+          </el-table-column>
           <el-table-column
             prop="product.activityPrice"
             width="120"
@@ -240,7 +257,7 @@
 // import chooseBook from './chooseBook.vue'
 // import AddOrUpdate from './shopproduct-add-or-update'
 export default {
-  props: ["urlList", "isEdit", "currentId", "currentType"],
+  props: ["urlList", "isEdit", "currentId", "currentType","oprateType"],
   data() {
     return {
       multipleSelectionAll: [], // 所有选中的数据包含跨页数据
@@ -264,6 +281,7 @@ export default {
       dataForm: {
         productName: "",
       },
+      oldSort:0, 
     };
   },
   watch: {
@@ -292,6 +310,48 @@ export default {
     shopDelete(row){
 this.$emit('delete',[row])
     },
+    cancelBtn(row){
+      row.isEdit = false 
+      this.oldSort = 0
+      if(row.sort == ""){row.sort = 0} 
+    },
+    changeSort(row){ // 确认排序   
+      if(this.oldSort == row.sort)   {return}
+      if(row.sort == ""){row.sort = 0} 
+      row.isEdit = false 
+      var url = ""
+      if(this.oprateType == "yingxiao"){
+        url = "/master/medicineLabelAndMarket/editMarketSort"
+      }else{
+        return
+      }
+      this.$http
+          .request({
+            url: this.$http.adornUrl(url),
+            method: "POST",
+            data: {
+              "id": row.id,
+               "sort": row.sort
+            },
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json"
+            }
+          })       
+      .then(({ data }) => {
+        if(data.code == 0 && data.msg == "success"){
+         
+          this.getAssociatedGoodsList()
+          this.oldSort = 0
+       // console.log(this.oldSort,'复原')
+        }       
+      });
+    },
+    myDbClick(row){ // 双击修改排序      
+      this.oldSort = row.sort
+      console.log(this.oldSort,88888888)
+      row.isEdit = true      
+    },
     // 获取商品类型
     getGoodsTypeList() {
       this.$http({
@@ -416,9 +476,14 @@ this.$emit('delete',[row])
         }),
       }).then(async ({ data }) => {
         if (data && data.code === 0) {
-          this.associatedGoodsList = [...data.result.records];
+          var list = [...data.result.records];
+          // this.associatedGoodsList = [...data.result.records];
 
           this.dataListLoading = false;
+          list.forEach((item) => {
+            item.isEdit = false
+          })
+          this.associatedGoodsList = list
         }
       });
     },
@@ -515,6 +580,10 @@ this.$emit('delete',[row])
 
 
 <style lang="less" scoped>
+.paixu{cursor: pointer;}
+.inputBox{display: flex; align-items:center;
+  .el-input{margin-right: 5px;}
+}
 li {
   padding: 0;
   margin: 0;

src/views/modules/shop/commonSociologyTags/shopproduct.vue

@@ -124,6 +124,23 @@
             sortable
             label="价格"
           >
+          </el-table-column>
+           <el-table-column v-if="oprateType=='yingxiao'" 
+           prop="sort"           
+            width="120"
+            header-align="center"
+            align="center"            
+            label="排序( 双击修改 )"
+          >
+          <template slot-scope="scope">
+            <div class="paixu"  @dblclick="myDbClick(scope.row)">
+            <span v-show="!scope.row.isEdit">{{scope.row.sort}}</span>
+            <div class="inputBox" v-show="scope.row.isEdit">
+              <el-input @keyup.enter.native="changeSort(scope.row)" min="0" @blur="changeSort(scope.row)"  v-model="scope.row.sort"  ></el-input>
+             <el-tag type="danger" size="mini" @click="cancelBtn(scope.row)">×</el-tag>
+            </div>  
+          </div>            
+          </template>
           </el-table-column>
           <el-table-column
             prop="product.activityPrice"
@@ -240,7 +257,7 @@
 // import chooseBook from './chooseBook.vue'
 // import AddOrUpdate from './shopproduct-add-or-update'
 export default {
-  props: ["urlList", "isEdit", "currentId", "currentType"],
+  props: ["urlList", "isEdit", "currentId", "currentType","oprateType"],
   data() {
     return {
       multipleSelectionAll: [], // 所有选中的数据包含跨页数据
@@ -263,7 +280,8 @@ export default {
       selectShopArr: [],
       dataForm: {
         productName: "",
-      },
+      },   
+      oldSort:0,   
     };
   },
   watch: {
@@ -292,6 +310,50 @@ export default {
     shopDelete(row){
 this.$emit('delete',[row])
     },
+    cancelBtn(row){
+      row.isEdit = false 
+      this.oldSort = 0
+      if(row.sort == ""){row.sort = 0} 
+    },
+    changeSort(row){ // 确认排序   
+      if(this.oldSort == row.sort)   {return}
+      row.isEdit = false 
+      if(row.sort == ""){row.sort = 0} 
+      // console.log(row)
+      // return false 
+      var url = ""
+      if(this.oprateType == "yingxiao"){
+        url = "/master/sociologyLabelAndMarket/editMarketSort"
+      }else{
+        return
+      } 
+      this.$http
+          .request({
+            url: this.$http.adornUrl(url),
+            method: "POST",
+            data: {
+              "id": row.id,
+               "sort": row.sort
+            },
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json"
+            }
+          })
+      .then(({ data }) => {
+        if(data.code == 0 && data.msg == "success"){
+         
+          this.getAssociatedGoodsList()
+          this.oldSort = 0
+       // console.log(this.oldSort,'复原')
+        }       
+      });
+    },
+    myDbClick(row){ // 双击修改排序      
+      this.oldSort = row.sort
+      console.log(this.oldSort,88888888)
+      row.isEdit = true      
+    },
     // 获取商品类型
     getGoodsTypeList() {
       this.$http({
@@ -416,9 +478,15 @@ this.$emit('delete',[row])
         }),
       }).then(async ({ data }) => {
         if (data && data.code === 0) {
-          this.associatedGoodsList = [...data.result.records];
+          var list = [...data.result.records];
+          // this.associatedGoodsList = [...data.result.records];
 
           this.dataListLoading = false;
+          
+          list.forEach((item) => {
+            item.isEdit = false
+          })
+          this.associatedGoodsList = list         
         }
       });
     },
@@ -515,6 +583,10 @@ this.$emit('delete',[row])
 
 
 <style lang="less" scoped>
+.paixu{cursor: pointer;}
+.inputBox{display: flex; align-items:center;
+  .el-input{margin-right: 5px;}
+}
 li {
   padding: 0;
   margin: 0;

src/views/modules/shop/medicinemarketingtags.vue

@@ -43,7 +43,7 @@
           </div>
         </div>
         <commonShop :currentId="addForm.id ? addForm.id : ''" currentType="bookMarketId" :dataList="associatedGoodsList"
-          :urlList="urlList" @delete="dataFormDelete" :isEdit="isEdit" ref="commonShop" :style="`height: calc(100% - 50px); `"></commonShop>
+          :urlList="urlList" @delete="dataFormDelete" :isEdit="isEdit" :oprateType="oprateType" ref="commonShop" :style="`height: calc(100% - 50px); `"></commonShop>
         <!-- <div class="submitButtonBox" v-if="isEdit">
           <el-checkbox v-model="checkAll" @change="handleCheckAllChange" style="float: left">全选</el-checkbox>
 
@@ -107,6 +107,7 @@ export default {
         add: "/master/medicineLabelAndMarket/saveOrUpdateMarket",
         getAssociatedGoodsList: "/master/medicineLabelAndMarket/getToMarketList",
       },
+      oprateType:"yingxiao", // yingxiao：类型是营销         fenlei:类型是分类
       addForm: {},
       isFresh: false,
       dataRule: {

src/views/modules/shop/sociologymarketingtags.vue

@@ -43,7 +43,7 @@
           </div>
         </div>
         <commonShop :currentId="addForm.id ? addForm.id : ''" currentType="bookMarketId" :dataList="associatedGoodsList"
-          :urlList="urlList" @delete="dataFormDelete" :isEdit="isEdit" ref="commonShop" :style="`height: calc(100% - 50px); `"></commonShop>
+          :urlList="urlList" @delete="dataFormDelete" :isEdit="isEdit" :oprateType="oprateType" ref="commonShop" :style="`height: calc(100% - 50px); `"></commonShop>
         <!-- <div class="submitButtonBox" v-if="isEdit">
           <el-checkbox v-model="checkAll" @change="handleCheckAllChange" style="float: left">全选</el-checkbox>
 
@@ -107,6 +107,7 @@ export default {
         add: "/master/sociologyLabelAndMarket/saveOrUpdateMarket",
         getAssociatedGoodsList: "/master/sociologyLabelAndMarket/getToMarketList",
       },
+      oprateType:"yingxiao", // yingxiao：类型是营销         fenlei:类型是分类
       addForm: {},
       isFresh: false,
       dataRule: {