init

src/api/modules/api.js

@@ -1016,3 +1016,11 @@ export function findByAgentId(query) {
     params:query
   })
 }
+//销讲词模板
+export function templategetMarketingTree(query) {
+  return request({
+    url: '/autoSR/marketing/getMarketingTree',
+    method:'get',
+    params:query
+  })
+}

src/views/Equipment/index.vue

@@ -361,7 +361,7 @@
             <el-button  v-if="orgType == 0 && equ_index_bind&&row.receiveType!=2" type="text" @click="toinfobinding()">绑定</el-button>
             <el-button  v-if="equ_index_del&&row.receiveType!=2" type="text" @click="toinifodelete()">删除</el-button> -->
 
-            <el-dropdown  v-if="(row.receiveType == 2 && euq_index_back)||equ_index_change||equ_index_auto||(row.acceptanceStatus == 1 && equ_index_makeSure)||(row.acceptanceStatus != (1 || 0) && euq_index_normal)||(orgType == 0 && equ_index_bind&&row.receiveType!=2)||(equ_index_del&&row.receiveType!=2)" @command="handleCommand($event, row)" trigger="click">
+            <el-dropdown  v-if="(row.receiveType == 2 && euq_index_back)||equ_index_change||equ_index_auto||(row.acceptanceStatus == 1 && equ_index_makeSure)||(row.acceptanceStatus != (1 || 0) && euq_index_normal)||( equ_index_bind&&row.receiveType!=2)||(equ_index_del&&row.receiveType!=2)||(equ_index_ubind&&row.propertyId)" @command="handleCommand($event, row)" trigger="click">
               <span style="color: #409eff; font-size: 12px; margin-left: 10px;   cursor: pointer;">
                 更多<i class="el-icon-arrow-down el-icon--right"></i>
               </span>
@@ -392,9 +392,14 @@
                 > -->
                 <el-dropdown-item
                   command="toinfobinding"
-                  v-if="orgType == 0 && equ_index_bind&&row.receiveType!=2"
+                  v-if="equ_index_bind&&row.receiveType!=2"
                   >绑定</el-dropdown-item
                 >
+                <el-dropdown-item
+                  command="equipmentUnbind"
+                  v-if="equ_index_ubind&&row.propertyId"
+                  >解绑</el-dropdown-item
+                >
                 <!-- <el-dropdown-item command="infoeditor">修改</el-dropdown-item> -->
                 <el-dropdown-item command="toinifodelete" v-if="equ_index_del&&row.receiveType!=2"
                   >删除</el-dropdown-item
@@ -857,6 +862,7 @@ export default {
     this.equ_index_add = this.permissions["equ_index_add"];
     this.equ_index_bind = this.permissions["equ_index_bind"];
     this.equ_index_unbind = this.permissions["equ_index_unbind"];
+    this.equ_index_ubind = this.permissions["equ_index_ubind"];
     this.equ_index_change = this.permissions["equ_index_change"];
     this.equ_index_auto = this.permissions["equ_index_auto"];
     this.equ_index_makeSure = this.permissions["equ_index_makeSure"];
@@ -1061,6 +1067,32 @@ export default {
           // });
         });
     },
+    equipmentUnbind(row){
+      this.$confirm("确认解绑吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.api
+            .zkequipmentUnbind({
+              imeis: row.imei,
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.equipmentManagement();
+            });
+        })
+        .catch(() => {
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消操作",
+          // });
+        });
+    },
     //批量转移确认
     Masstransfer() {
       this.$refs.allbindForm.validate((valid) => {
@@ -1090,7 +1122,7 @@ export default {
     },
     //批量归还
     Batchreturn() {
-      this.$confirm("确认批量解绑吗?", "提示", {
+      this.$confirm("确认批量归还吗?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/ReceivingRecords/index.vue

@@ -84,13 +84,13 @@
             v-model="searchForm.keywordsId"
             placeholder="请选择"
           >
-            <el-option
-              v-for="item in keywordsList"
-              :key="item.keywordsId"
-              :label="item.name"
-              :value="item.keywordsId"
-            >
-            </el-option>
+                <el-option
+                  v-for="item in keywordsList"
+                  :key="item.keywordsId"
+                :label="item.isInterval==0?item.name+'-'+item.endName+item.unit:item.name"
+                  :value="item.keywordsId"
+                >
+                </el-option>
           </el-select>
         </div>
 

src/views/Template/Pinspeakwords.vue

@@ -255,7 +255,7 @@ export default {
        let parmest={
          houseId:this.houseId,
       }
-        this.$api.http.templategetMarketingTree(parmest).then((res) => {
+        this.$api.api.templategetMarketingTree(parmest).then((res) => {
           console.log(res);
             let data = res.data;
             data = JSON.stringify(data).replace(/name/g, "label");