whj 1 éve
szülő
commit
0f388f856b

+ 10 - 4
src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -183,7 +183,7 @@
               </a-tree-select>
             </a-form-item>
           </row-item>
-          <row-item >
+          <!-- <row-item >
             <a-form-item
               label="物资描述"
               :labelCol="BaseTool.Constant.labelCol"
@@ -192,7 +192,7 @@
               <a-textarea
                 v-decorator="['cdefine11', { rules: [{required: true, message: '物资描述不能为空'}]}]"/>
             </a-form-item>
-          </row-item>
+          </row-item> -->
           <row-item >
             <a-form-item
               label="物料简述"
@@ -227,8 +227,8 @@
         <template slot="ftaxprice" slot-scope="text, record">
           <a-input v-model="record.ftaxprice" />
         </template>
-        <template slot="cdefine12" slot-scope="text, record">
-          <a-input v-model="record.cdefine12" />
+        <template slot="cbmemo" slot-scope="text, record">
+          <a-input v-model="record.cbmemo" />
         </template>
         <template slot="num" slot-scope="text, record">
           <a-input v-model="record.num" />
@@ -308,6 +308,12 @@ export default {
           title: '批号',
           dataIndex: 'cbatch'
         },
+        {
+          title: '物资描述',
+          dataIndex: 'cbmemo',
+          width: 150,
+          scopedSlots: { customRender: 'cbmemo' }
+        },
         {
           title: '单价',
           dataIndex: 'ftaxprice',