出入库申请

src/views/modules/warehouse/stock-order-inbound.vue

@@ -7,8 +7,8 @@
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
       <el-row class="my-row">
         <el-col :span="12">
-          <el-form-item label="编码" prop="code">
-            <el-input v-model="dataForm.code" placeholder="缺字段"></el-input>
+          <el-form-item label="编码" prop="recordCode">
+            <el-input v-model="dataForm.recordCode" placeholder="编码"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6" style="padding-left: 20px">

src/views/modules/warehouse/stock-order.vue

@@ -12,6 +12,9 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="编码">
+        <el-input v-model="dataForm.recordCode" placeholder="请输入出入库编码" clearable/>
+      </el-form-item>
       <el-form-item label="申请人姓名">
         <user-component v-model="dataForm.userId"/>
       </el-form-item>
@@ -53,21 +56,24 @@
         align="center">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="recordCode"
         header-align="center"
         align="center"
+        min-width="160"
         label="编码">
       </el-table-column>
       <el-table-column
         prop="recordType"
         header-align="center"
         align="center"
+        :formatter="formatRecordType"
         label="申请单类别">
       </el-table-column>
       <el-table-column
         prop="state"
         header-align="center"
         align="center"
+        :formatter="formatState"
         label="申请状态">
       </el-table-column>
       <el-table-column
@@ -77,19 +83,21 @@
         label="当前审批员">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="createTime"
         header-align="center"
         align="center"
+        min-width="160"
         label="申请时间">
       </el-table-column>
       <el-table-column
         prop="recordTime"
         header-align="center"
         align="center"
+        min-width="160"
         label="入库时间">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="applicant"
         header-align="center"
         align="center"
         label="申请人">
@@ -136,8 +144,30 @@
         dataForm: {
           userId: '',
           date: '',
-          recordType: null
+          recordType: '0'
         },
+        optionsState: [
+          {
+            code: '0',
+            value: '待提交'
+          },
+          {
+            code: '1',
+            value: '待审批'
+          },
+          {
+            code: '2',
+            value: '审批中'
+          },
+          {
+            code: '3',
+            value: '审批完成'
+          },
+          {
+            code: '4',
+            value: '审批不通过'
+          }
+        ],
         recordTypeOptions: [
           {
             value: null,
@@ -169,7 +199,7 @@
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/biz-service/inbound-record-ctl/list'),
+          url: this.$http.adornUrl('/biz-service/in-out-bound-ctl/my-submit-inbound-apply'),
           method: 'get',
           params: this.$http.adornParams({
             'current': this.pageIndex,
@@ -177,7 +207,8 @@
             'userId': this.dataForm.userId ? this.dataForm.userId : '',
             'beginTime': this.dataForm.date[0],
             'endTime': this.dataForm.date[1],
-            'recordType': this.dataForm.recordType
+            'recordType': this.dataForm.recordType,
+            'recordCode': this.dataForm.recordCode
           })
         }).then(({data}) => {
           if (data && data.code === '200') {
@@ -217,6 +248,19 @@
         this.$nextTick(() => {
           this.$refs.outbound.init()
         })
+      },
+      // 申请单类型
+      formatRecordType (row) {
+        if (!row.recordType) return ''
+        if (row.recordType === '0') return '入库'
+        if (row.recordType === '1') return '出库'
+        return ''
+      },
+      // 转换属性“状态”
+      formatState (row) {
+        if (!row.purchaseState) return ''
+        const item1 = this.optionsState.find((item) => item.code === row.purchaseState.toString())
+        return item1 ? item1.value : ''
       }
     }
   }