代码更新

mes/qd/src/views/wms/statistics/materPlan/index.vue

@@ -11,9 +11,26 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="到货日期">
+          <el-form-item label="统计日期">
             <date-range-picker v-model="query.createTime" class="date-item"/>
           </el-form-item>
+          <el-form-item label="所属组织">
+            <el-select
+              v-model="query.org_id"
+              clearable
+              size="mini"
+              placeholder="所属组织"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in Depts"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation/>
         </el-form>
       </div>
@@ -30,9 +47,10 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="100" align="center"/>
+        <el-table-column type="index" label="序号" width="100" align="center" fixed/>
         <template v-for="(col,index) in cols">
-          <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+          <el-table-column v-if="col.prop !== '1'" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+          <el-table-column v-if="col.prop === '1'" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip fixed/>
         </template>
       </el-table>
 
@@ -45,9 +63,10 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="100" align="center"/>
+        <el-table-column type="index" label="序号" width="100" align="center" fixed/>
         <template v-for="(col,index) in cols2">
-          <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+          <el-table-column v-if="!col.option" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
+          <el-table-column v-if="col.option" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip fixed/>
         </template>
       </el-table>
       <!--分页组件-->
@@ -67,6 +86,7 @@ import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
 import Date from '@/utils/datetime'
+import workorder from '@/api/wms/pdm/workorder'
 
 const start = new Date()
 export default {
@@ -96,6 +116,7 @@ export default {
       cols: [],
       cols2: [],
       dtlList: [],
+      Depts: [],
       statusList: [],
       permission: {},
       rules: {}
@@ -104,7 +125,9 @@ export default {
   beforeCreate() {
   },
   created() {
-
+    workorder.getDepts().then(res => {
+      this.Depts = res
+    })
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue

@@ -131,7 +131,7 @@ export default {
         add: false,
         edit: false,
         del: false,
-        download: false,
+        download: true,
         reset: true
       }
     })