Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -231,7 +231,8 @@ export default {
         }
         }
       this.loading = true
       this.loading = true
       this.bsmList.forEach(item=>{
       this.bsmList.forEach(item=>{
-        item['bdcdyid'] = item.dyhbsm
+        item['bdcdyid'] = item.dyhbsm;
+        item['bdcdylx'] = '7';
       })
       })
       startBusinessFlow({
       startBusinessFlow({
         bsmSqyw: this.sqywInfo.bsmSqyw,
         bsmSqyw: this.sqywInfo.bsmSqyw,

@@ -30,9 +30,8 @@
           class="tablelist"
           class="tablelist"
           :data="datalist"
           :data="datalist"
           ref="listTable"
           ref="listTable"
-
           :key="key"
           :key="key"
-          row-key="bsmMb"
+          row-key="name"
           :pagination="false"
           :pagination="false"
           :header-cell-style="{ 'text-align': 'center' }"
           :header-cell-style="{ 'text-align': 'center' }"
           :heightNumSetting="true"
           :heightNumSetting="true"
@@ -108,19 +107,19 @@
         array[index1] = array.splice(index2, 1, array[index1])[0];
         array[index1] = array.splice(index2, 1, array[index1])[0];
       },
       },
       initSort () {
       initSort () {
-        const el = this.$refs.listTable.$el.querySelectorAll(
-          ".el-table__body-wrapper > table > tbody"
-        )[0];
-
-        this.sortable = new Sortable(el, {
-          ghostClass: "sortable-ghost",
-          setData: function (dataTransfer) {
-            dataTransfer.setData("Text", "");
-          },
-          onEnd: (evt) => {
-            // 其他排序逻辑
-            // const targetRow = this.datalist.splice(evt.oldIndex, 1)[0]
-            // this.datalist.splice(evt.newIndex, 0, targetRow);
+           const el =  this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+	      // const sortable = new Sortable(el, options);
+	      // 根据具体需求配置options配置项
+	      const sortable = new Sortable(el, {
+	        onEnd: (evt) => { // 监听拖动结束事件
+	          console.log(this) // this是当前vue上下文
+	          console.log(evt.oldIndex) // 当前行的被拖拽前的顺序
+	          console.log(evt.newIndex) // 当前行的被拖拽后的顺序
+	          // 这里就可以写我们需要传给后台的逻辑代码
+	          // 我们有了 evt.oldIndex 和 evt.newIndex 这两个参数做索引，我们可以根据绑定在表格上面的 data 这个 Array 找到两个相应的记录。就可以针对数据进行操作啦。
+	          // 下面将拖拽后的顺序进行修改
+	          const currRow = this.datalist.splice(evt.oldIndex, 1)[0]
+	          this.datalist.splice(evt.newIndex, 0, currRow)
           }
           }
         })
         })
       },
       },
@@ -178,8 +177,7 @@
           });
           });
         });
         });
         this.checkedCities = orlist
         this.checkedCities = orlist
-        this.tablelist = lists;
-        this.datalist = this.tablelist
+        this.datalist = lists;
         // 其他排序逻辑
         // 其他排序逻辑
         this.initSort()
         this.initSort()
       },
       },
@@ -198,8 +196,7 @@
             }
             }
           });
           });
         });
         });
-        this.tablelist = lists;
-        this.datalist = this.tablelist
+        this.datalist = lists;
         // 其他排序逻辑
         // 其他排序逻辑
         this.initSort()
         this.initSort()
       },
       },

@@ -69,7 +69,7 @@
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="坐落：">
             <el-form-item label="坐落：">
-              <el-input maxlength="100" v-model="ruleForm.sldy.zl" disabled></el-input>
+              <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>