发货确认

src/views/MarketingCenter/DeliveryApplication/index.vue

@@ -267,6 +267,15 @@
           style="width: 200px;margin-right: 10px"
           clearable/>
       </div>
+      <div class="text item">
+        <span style="width:80px;display:inline-block;">备注：</span>
+        <el-input
+          v-model="input_Record"
+          :disabled="disabled"
+          size="mini"
+          style="width: 795px;margin-right: 10px"
+          clearable/>
+      </div>
       <el-divider content-position="right"><el-button :disabled="disabledPick" type="text" icon="el-icon-edit" @click="function_Pick">选货</el-button></el-divider>
       <el-table
         v-loading="listLoading"
@@ -276,7 +285,7 @@
         height="300"
         border
         size="mini">
-        <el-table-column align="center" label="货品类别">
+        <el-table-column align="center" label="货品类别" width="80">
           <template slot-scope="scope">
             <el-tag effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</el-tag>
           </template>
@@ -301,7 +310,7 @@
             {{ scope.row.货品型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="数量">
+        <el-table-column align="center" label="数量" width="80">
           <template slot-scope="scope">
             <template v-if="disabledPick === false">
               <el-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>
@@ -311,7 +320,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="设计者">
+        <el-table-column align="center" label="设计者" width="80">
           <template slot-scope="scope">
             {{ scope.row.设计者 }}
           </template>
@@ -578,7 +587,7 @@
           </el-table-column>
           <el-table-column align="center" label="发货时间">
             <template slot-scope="scope">
-              {{ scope.row.发货时间 }}
+              {{ scope.row.发出时间 }}
             </template>
           </el-table-column>
         </el-table>
@@ -597,6 +606,7 @@ import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
+      input_Record: '',
       disabled: true,
       disabledAdd: false, // 增加按钮启用状态
       disabledEdit: true, // 编辑按钮启用状态
@@ -780,6 +790,7 @@ export default {
       if (this.invoiceNum !== '' && this.invoiceNum !== null) {
         InvoiceFeach(this.invoiceNum).then(response => {
           if (response.data.length !== 0) {
+            this.input_Record = response.data[0].备注
             this.input_Adress = response.data[0].收货地址
             this.input_People = response.data[0].收货人员
             this.input_Mobile = response.data[0].联系电话
@@ -927,11 +938,11 @@ export default {
         type: 'warning'
       }).then(() => {
         InvoiceAbandoningTrial(this.invoiceNum).then(response => {
-          if (response.data[0].result === '1') {
+          if (response.data[0].弃审是否成功 === '成功') {
             this.$message.success('放弃核准成功！')
             this.function_InvoiceFeach()
           } else {
-            this.$message.error('放弃核准失败')
+            this.$message.error('放弃核准失败,可能原因是装配部门已经确认发货,如需调整请联系装配部门打回！')
           }
         })
       })