生产和项目看板修改

hh
1 parent 91c6c7bb
Showing 2 changed files with 29 additions and 10 deletions
src/views/scheduler/progressRate.vue
src/views/scheduler/progressRateCopy.vue
 <template>
   <div>
     <div class="table-page-search-wrapper">
-      <a-form layout="inline">
+      <!-- <a-form layout="inline">
         <a-row :gutter="10">
           <a-col :md="6" :sm="24">
             <a-form-item label="项目名称">
@@ -16,9 +16,25 @@
             </a-form-item>
           </a-col>
         </a-row>
-      </a-form>
+      </a-form> -->
     </div>
  
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="10">
+          <a-col :md="6" :sm="8">
+                  <a-form-item label="工作令号">
+                    <!--  <a-input placeholder="请输入工作令号" v-model="queryParam.workNo"></a-input>-->
+                    <j-popup  v-model="queryParam" code="find_projectc" field="field0056" orgFields="field0056" destFields="field0056" :multi="false"/>
+                  </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+                <a-button type="primary" @click="handleChange(queryParam)">查询</a-button>
+                <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
     <gantt-elastic
       :options="options"
       :tasks="tasks"
@@ -65,7 +81,7 @@ let options = {
   maxRows: 100,
   maxHeight: 500,
   title: {
-    label: "",
+    label: "生产进度看板",
     html: false
   },
   row: {
@@ -200,6 +216,7 @@ export default {
   data() {
     return {
       tasks: [],
+      projectName:'',
       options,
       dynamicStyle: {
         'task-list-header-label': {
@@ -264,6 +281,7 @@ export default {
       if (projectName == null || projectName === "") {
         return;
       }
+      this.tasks = []
       let params = {
         "projectName": projectName
       };
@@ -273,7 +291,7 @@ export default {
           this.tasks = res.result
         }
       })
-    }
+    },
   }
 }
 </script>
@@ -12,9 +12,9 @@
           <a-col :md="6" :sm="8">
               <a-form-item label="工作令号">
                 <!--  <a-input placeholder="请输入工作令号" v-model="queryParam.workNo"></a-input>-->
-                <j-popup  v-model="queryParam.workNo" code="find_projectc" field="field0056" orgFields="field0056" destFields="field0056" :multi="true"/>
+                <j-popup  v-model="queryParam.workNo" code="find_projectc" field="field0056" orgFields="field0056" destFields="field0056" :multi="false"/>
               </a-form-item>
-            </a-col>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="getTask(queryParam.workNo)">查询</a-button>
             <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
@@ -69,7 +69,7 @@ let tasks = [
     "id": "1",
     "isOnTime": "否",
     "start": 1616575959000,
-    "taskPoint": "测试项目1",
+    "taskPoint": "展示",
     "type": "task",
     "style": {
       "base": {
@@ -168,16 +168,17 @@ let options = {
         width: 100,
       },
       {
-        id: 9,
+        id: 5,
         label: "意见",
         value: "opinion",
         width: 60
       },
       {
-        id: 9,
+        id: 6,
         label: "按时完成",
         value: "isOnTime",
-        width: 60
+        width: 60,
+        expander: true
       }
     ]
   },