修改废旧数据显示

src/views/waste/ProcessWasteList.vue

@@ -35,11 +35,11 @@
                 <a-input placeholder="请选择仓库位置" v-model="queryParam.depositary" dict=",,"/>
               </a-form-item>
             </a-col>
-          <a-col :xl="3" :lg="7" :md="8" :sm="24">
-            <a-form-item label="创建人">
-              <a-input placeholder="请选择创建人" v-model="queryParam.createBy" dict=",,"/>
-            </a-form-item>
-          </a-col>
+<!--          <a-col :xl="3" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="创建人">-->
+<!--              <a-input placeholder="请选择创建人" v-model="queryParam.createBy" dict=",,"/>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form>
     </div>
@@ -150,7 +150,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -160,27 +160,27 @@
             }
           },
           {
-            title:'物料码',
+            title:'物料组',
             align:"center",
-            dataIndex: 'descriptionId'
+            dataIndex: 'materialClassify'
           },
           {
-            title:'品牌',
+            title:'物料编号',
             align:"center",
-            dataIndex: 'brand'
+            dataIndex: 'materialsNumber'
           },
           {
-            title:'名称',
+            title:'商品名称及规格型号',
             align:"center",
             scopedSlots: { customRender: 'materialName' },
             dataIndex: 'materialName'
           },
-          {
-            title:'型号规格',
-            align:"center",
-            scopedSlots: { customRender: 'typeSpecification' },
-            dataIndex: 'typeSpecification'
-          },
+          // {
+          //   title:'型号规格',
+          //   align:"center",
+          //   scopedSlots: { customRender: 'typeSpecification' },
+          //   dataIndex: 'typeSpecification'
+          // },
           {
             title:'单位',
             align:"center",
@@ -195,7 +195,7 @@
             title:'存放地点',
             align:"center",
             scopedSlots: { customRender: 'depositary' },
-            dataIndex: 'depositary'
+            dataIndex: 'depositary_dictText'
           },
           {
             title:'报废原因',
@@ -205,7 +205,7 @@
           {
             title:'所属单位',
             align:"center",
-            dataIndex: 'affiliation'
+            dataIndex: 'departId_dictText'
           },
           {
             title:'报废日期',

src/views/waste/ProcessWasteListCable.vue

@@ -163,7 +163,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,