完善仓库

src/views/store/outstoreform/OutStoreFormYY.vue

@@ -59,16 +59,16 @@
         <span slot="action" slot-scope="record">
           <template>
             <a @click="handleView(record)">查看</a>
-            <a-divider v-if="record.status == 3 || record.status == 2" type="vertical" />
-            <a v-if="record.status == 3 || record.status == 2" @click="handleViewTicket(record)">打印</a>
             <a-divider v-if="record.status == 0" type="vertical" />
             <a v-if="$auth('store-out-store-forms-edit')&&record.status==0" @click="handleEdit(record)">修改</a>
+            <a-divider v-if="record.status == 5 || record.status == 4" type="vertical" />
+            <a v-if="record.status == 4 || record.status == 5" @click="handleViewTicket(record)">打印</a>
             <a-divider v-if="record.status==0" type="vertical" />
             <a-popconfirm v-if="record.status==0" title="是否提交审核？" @confirm="updateStore(record.id)">
               <a>提交审核</a>
             </a-popconfirm>
-            <a-divider v-if="record.status==4" type="vertical" />
-            <a-popconfirm v-if="record.status==4" title="重新推送？" @confirm="rePush(record.id)">
+            <a-divider v-if="record.status==3" type="vertical" />
+            <a-popconfirm v-if="record.status==3" title="重新推送？" @confirm="rePush(record.id)">
               <a>重新推送</a>
             </a-popconfirm>
             <a-divider v-if="record.status==0" type="vertical" />
@@ -158,8 +158,8 @@ export default {
           scopedSlots: { customRender: 'status' }
         },
         {
-          title: '创建日期',
-          dataIndex: 'createdTime'
+          title: '领用日期',
+          dataIndex: 'userTime'
         },
         {
           title: '仓库',

src/views/store/outstoreform/modules/TicketForm.vue

@@ -10,7 +10,7 @@
         <div style="font-size:26px;font-weight:700">{{ type? '物资领料单':'物资退库单' }}</div>
       </div>
       <div style="display:flex;justify-content:space-between; margin: 10px auto;width: 1030px;">
-        <a-radio-group v-if="type" v-model="value1">
+<!--        <a-radio-group v-if="type" v-model="value1">
           <a-radio :value="1">
             <a-icon class="check" v-show="value1 ==1" type="check" />成品出库
           </a-radio>
@@ -22,8 +22,9 @@
           <a-radio :value="1">
             <a-icon class="check" v-show="value1 ==1" type="check" />工程剩余退回
           </a-radio>
-        </a-radio-group>
-        <div>日期：{{ model.updateTime }}</div>
+        </a-radio-group>-->
+        <div>单号：{{ model.yyId }}</div>
+        <div>日期：{{ model.userTime }}</div>
       </div>
       <div class="tables" >
         <table>
@@ -86,8 +87,8 @@ export default {
       value1: 1,
       type: true,
       model: {
-        'repairNo': null,
-        'callTime': null,
+        'yyId': null,
+        'userTime': null,
         'sbNo': null,
         'sbName': null,
         'sbLocation': null,