Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/components/table-um.vue

@@ -115,6 +115,13 @@
             <span v-if="item.type === 'Button'">
               <b v-for="(btn, key) in item.btnList" :key="key">
                 <em
+                  v-if="btn.label == '分配'||btn.label == '已分配'"
+                >
+                  <em v-if="btn.label == '分配'&&scope.row.state == 0"  style="color: #0f2683" @click="handleClick(btn.type, scope.row)">{{ btn.label }}</em>
+                  <em v-if="btn.label == '已分配'&&scope.row.state == 1">{{ btn.label }}</em>
+                </em>
+                <em
+                  v-else
                   :class="btn.type"
                   :style="{color: btn.label=='删除' ? '#830f53' : '#0f2683'}"
                   @click="handleClick(btn.type, scope.row)"

src/pages/workPlace.vue

@@ -189,6 +189,7 @@
             :headers="service_head[now_user][now_type]"
             :url="service_url_arr[now_user][now_type]"
             :paginationShow="true"
+            @distribut="distribut"
           ></table-um>
         </div>
       </div>
@@ -619,11 +620,10 @@ export default {
               btnList: [
                 {
                   label: "分配",
-                  type: 1
+                  type: "distribut"
                 },
                 {
                   label: "已分配",
-                  type: 1
                 }
               ]
             }
@@ -974,6 +974,10 @@ export default {
     }, 500);
   },
   methods: {
+    //分配接口调用
+    distribut(val){
+      console.log(val);
+    },
     manage_func(n) {
       console.log(n);
     },

static/data.json

@@ -283,7 +283,8 @@
                 "cpu": "2",
                 "ncgb": "12",
                 "zyzlgb": "1024",
-                "sqzt": "审批通过"
+                "sqzt": "审批通过",
+                "state":1
             },
             {
                 "id": 1,
@@ -292,7 +293,8 @@
                 "cpu": "2",
                 "ncgb": "12",
                 "zyzlgb": "1024",
-                "sqzt": "审批通过"
+                "sqzt": "审批通过",
+                "state":0
             },
             {
                 "id": 1,
@@ -301,7 +303,8 @@
                 "cpu": "2",
                 "ncgb": "12",
                 "zyzlgb": "1024",
-                "sqzt": "审批通过"
+                "sqzt": "审批通过",
+                "state":0
             },
             {
                 "id": 1,
@@ -310,7 +313,8 @@
                 "cpu": "2",
                 "ncgb": "12",
                 "zyzlgb": "1024",
-                "sqzt": "审批通过"
+                "sqzt": "审批通过",
+                "state":0
             },
             {
                 "id": 1,
@@ -319,7 +323,8 @@
                 "cpu": "2",
                 "ncgb": "12",
                 "zyzlgb": "1024",
-                "sqzt": "审批通过"
+                "sqzt": "审批通过",
+                "state":1
             }
         ],
         "nor_cloud_manage":[