whj il y a 1 an
Parent
commit
a79a80bf50

+ 29 - 0
src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -33,6 +33,7 @@
               </a-select>
             </a-form-item>
           </row-item>
+
           <row-item >
             <a-form-item
               label="计划备注"
@@ -182,6 +183,16 @@
               </a-tree-select>
             </a-form-item>
           </row-item>
+          <row-item >
+            <a-form-item
+              label="物资描述"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-textarea
+                v-decorator="['cbmemo', { rules: [{required: true, message: '物资描述不能为空'}]}]"/>
+            </a-form-item>
+          </row-item>
         </row-list>
       </a-form>
     </a-card>
@@ -203,6 +214,12 @@
         tableLayout="auto"
         rowKey="id"
       >
+        <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>
         <template slot="num" slot-scope="text, record">
           <a-input v-model="record.num" />
         </template>
@@ -277,6 +294,18 @@ export default {
           title: '货架号',
           dataIndex: 'storePosition'
         },
+        {
+          title: '物料简述',
+          dataIndex: 'cdefine12',
+          width: 150,
+          scopedSlots: { customRender: 'cdefine12' }
+        },
+        {
+          title: '单价',
+          dataIndex: 'ftaxprice',
+          width: 150,
+          scopedSlots: { customRender: 'ftaxprice' }
+        },
         {
           title: '申请数量',
           dataIndex: 'num',

+ 1 - 1
src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -21,7 +21,7 @@
         </div>
       </a-col>
       <a-col :span="6">
-        <div class="target" @click="$router.push('/preparation/mine?status='+ JSON.stringify([3,6,9,12,18]))">
+        <div class="target" @click="$router.push('/preparation/mine?status='+ JSON.stringify([18]))">
           <div class="target-title">
             被拒工单 <a-icon type="caret-left" />
           </div>