Merge branch 'linwenxin_workOrder' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/views/workOrder/workOrderPool/components/reassignment/index.vue

@@ -40,7 +40,8 @@ export default {
         workerId_fz: "",
         orderWorkers: [],
         recordSelected: []
-      }
+      },
+      isAllWebsit:true
     }
   },
   computed: {

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/pandanxinxi.js

@@ -50,7 +50,7 @@ export default {
                   label: '操作',
                 },
                 render: (h, { row, column, index }) => {
-                  return !row.isMaster? (
+                  return !row.isMaster ? (
                     <div style="padding-left:10px">
                       <el-button type="text" onClick={() => {
                         this.orderInfo.orderWorkers.splice(index, 1)
@@ -202,7 +202,7 @@ export default {
     }
   },
   created() {
-    getWebsit({ type: "C", status: true }).then(res => {
+    getWebsit({ type: "C", status: true, isAll: this.isAllWebsit || this.id ? true : false }).then(res => {
       this.websitList = res.data.map(item => ({
         label: item.name,
         value: item.websitId