2

src/components/coffeeManage/componemt/zc.vue

+<template>
+  <div>
+    <el-dialog title="选择资产" :visible.sync="show" width="800px" :before-close="handleClose">
+      <div class="search">
+        <el-input
+          v-model="msg.Name"
+          placeholder="请输入资产名称"
+          @keyup.native.enter="getData"
+          size="small"
+          style="margin-right:25px"
+        ></el-input>
+        <el-button type="primary" size="small" @click="getData">搜索</el-button>
+      </div>
+      <div>
+        <el-table :data="tableData" style="width: 100%" height="50vh">
+          <el-table-column width="80" label="Id" align='center' fixed>
+              <template slot-scope="scope">
+                  <el-radio v-model="radio" :label="scope.row.Id"></el-radio>
+              </template>
+           </el-table-column>
+          <el-table-column prop="Name" label="名称" width="180" align='center'></el-table-column>
+          <el-table-column prop="SuppliesNum" label="资产编码" width="120" align='center'></el-table-column>
+          <el-table-column prop="CategoryName" label="分类" width="120" align='center'></el-table-column>
+          <el-table-column prop="BrandName" label="品牌" width="120" align='center'> </el-table-column>
+          <el-table-column prop="SuppliesModel" label="型号"  width="120" align='center'> </el-table-column>
+          <el-table-column prop="Units" label="单位"  width="80" align='center'> </el-table-column>
+          <el-table-column prop="Money" label="单价"  width="120" align='center'> </el-table-column>
+          <el-table-column prop="InventoryNum" label="库存"  width="80" align='center'></el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="close">取 消</el-button>
+        <el-button type="primary" @click="confirm"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  model: {
+    prop: "show",
+    event: "change"
+  },
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      tableData: [],
+      radio:"",
+      msg: {
+        RB_Group_Id: 0,
+        Name: ""
+      }
+    };
+  },
+  methods: {
+    close() {
+      this.$emit("change", false);
+    },
+    confirm(){
+        let res= this.tableData.find(e=>e.Id===this.radio)
+        if(res){
+             this.close()
+             this.$emit("confirm", res);
+        }else{
+            this.$message.error("请选择资产");
+        }
+    },
+    getData() {
+      if (!this.msg.Name) {
+        this.$message.error("请输入资产名称");
+        return;
+      }
+      this.i_post("/api/Property/GetEduGoodsMaterialList", this.msg, res => {
+        this.tableData = res.data.data;
+      });
+    },
+    handleClose(done) {
+         this.close()
+      }
+  },
+  mounted() {
+    let apiData = JSON.parse(localStorage.getItem("iframeData"));
+    this.msg.RB_Group_Id = apiData.GroupId;
+  }
+};
+</script>
+<style scoped>
+.search {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+}
+</style>

src/components/orderMan/orderList.vue

@@ -173,7 +173,7 @@
             align-items: center;
             font-size: 12px;
           "
-          v-if="TenantId == 1"
+          v-if="TenantId == 1||TenantId == 15"
         >
           <div class="fkbox">
             <div class="fkbox_item" style="background: #00ffff"></div>
@@ -656,7 +656,7 @@
                     v-if="
                       (list.SFinanceList.length > 0 ||
                         list.ZFinanceList.length > 0) &&
-                      TenantId == 1
+                      (TenantId == 1||TenantId == 15)
                     "
                   >
                     <div

src/plug/index.js

@@ -589,9 +589,9 @@ export default {
         })
           .then(res => {
             if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
-              this.$router.push({
-                path: '/login'
-              });
+              // this.$router.push({
+              //   path: '/login'
+              // });
             } else if (res.resultCode == 10005) {
               this.$router.go(-1);
             } else {
@@ -604,7 +604,10 @@ export default {
         msg = {}
       }
       var timestamp = (new Date()).valueOf();
-      let apiData = JSON.parse(localStorage.getItem('iframeData')) 
+      let apiData={}
+      if (localStorage.getItem('iframeData')) {
+        apiData = JSON.parse(localStorage.getItem('iframeData')) 
+      }
       var token = apiData.token;
       var key = "";
       var TenantId = "0"; //商户Id

src/router/index.js

@@ -1753,5 +1753,15 @@ export default new Router({
       path: '/coffeeManage/edit',
       component: resolve => require(['@/components/coffeeManage/edit'], resolve),
     },
+    {
+      path: '/coffeeManage/order',
+      name:"/coffeeManage/order",
+      component: resolve => require(['@/components/coffeeManage/orderList'], resolve),
+    },
+    {
+      path: '/coffeeManage/orderDetails',
+      name: "/coffeeManage/orderDetails",
+      component: resolve => require(['@/components/coffeeManage/orderDetails'], resolve),
+    },
   ]
 })