Просмотр исходного кода

收货确认单改为发货确认单

yusheng 11 месяцев назад
Родитель
Сommit
ee261dda7c

+ 1 - 1
src/enum/dict.js

@@ -227,7 +227,7 @@ export const pricingWayList = [
 ];
 //来源类型
 export const relationType = {
-  1: '货确认单'
+  1: '货确认单'
 };
 
 //委外订单来源类型

+ 1 - 1
src/views/saleManage/saleOrder/index.vue

@@ -345,7 +345,7 @@
           { key: 'saleorder', name: '销售订单' },
           { key: 'entrustedReceive', name: '受托收货单' },
           { key: 'invoice', name: '发货单' },
-          { key: 'invoiceConfirm', name: '货确认单' },
+          { key: 'invoiceConfirm', name: '货确认单' },
           { key: 'trayList', name: '托盘清单' },
           { key: 'exceptionList', name: '异常列表' },
           { key: 'returnorder', name: '退货单' },

+ 1 - 1
src/views/saleManage/saleOrder/invoice/index.vue

@@ -142,7 +142,7 @@
               @click="creatInvoiceConfirm(row)"
               v-if="[2].includes(row.reviewStatus)"
             >
-              创建货确认单
+              创建货确认单
             </el-link>
             <el-link
               type="primary"

+ 6 - 6
src/views/saleManage/saleOrder/invoiceConfirm/components/addInvoiceDialog.vue

@@ -19,7 +19,7 @@
       class="el-form-box"
       label-width="120px"
     >
-      <headerTitle title="货确认单信息"></headerTitle>
+      <headerTitle title="货确认单信息"></headerTitle>
       <el-row :gutter="12">
         <el-col :span="12">
           <el-form-item label="发货单" prop="sendNo">
@@ -313,8 +313,8 @@
         activeName: 'first',
         formDef,
         options: [
-          { value: 0, label: '已货' },
-          { value: 1, label: '未货' }
+          { value: 0, label: '已货' },
+          { value: 1, label: '未货' }
         ],
         options1: [
           { value: 0, label: '未回收' },
@@ -517,7 +517,7 @@
             width: 120,
             slot: 'isException',
             prop: 'isException',
-            label: '货状态',
+            label: '货状态',
             align: 'center',
             fixed: 'right'
           }
@@ -820,7 +820,7 @@
 
       //打开新增编辑弹框
       async open(type, row, invoiceData) {
-        this.title = type === 'add' ? '新增货确认单' : '修改';
+        this.title = type === 'add' ? '新增货确认单' : '修改';
         this.row = row;
         this.visible = true;
         if (row && row?.id) {
@@ -913,7 +913,7 @@
             variables: {
               businessCode: data.docNo,
               businessName: data.contactName,
-              businessType: '货确认单'
+              businessType: '货确认单'
             }
 
           };

+ 4 - 4
src/views/saleManage/saleOrder/invoiceConfirm/components/detailDialog.vue

@@ -54,7 +54,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="货确认单编码:" prop="entrustedCode">
+            <el-form-item label="货确认单编码:" prop="entrustedCode">
               <el-input v-model="form.docNo" disabled></el-input>
             </el-form-item>
 
@@ -166,7 +166,7 @@
         cacheKeyUrl:'eos-saleManage-invoiceConfirm-inventoryTableDetails',
         activeComp: 'main',
         tabOptions: [
-          { key: 'main', name: '货确认单详情' },
+          { key: 'main', name: '货确认单详情' },
           { key: 'bpm', name: '流程详情' }
           // {key: 'store', name: '出库单详情'},
         ],
@@ -487,10 +487,10 @@
           {
             width: 150,
             prop: 'isException',
-            label: '货状态',
+            label: '货状态',
             slot: 'isException',
             formatter: (row, column) => {
-              return row.isException == 1 ? '未收货' : '已收货';
+              return row.isException == 1 ? '未发货' : '已发货';
             },
             fixed: 'right',
             align: 'center'

+ 1 - 1
src/views/saleManage/saleOrder/invoiceConfirm/components/searchTable.vue

@@ -16,7 +16,7 @@ export default {
           label: '关键字:',
           value: 'searchName',
           type: 'input',
-          placeholder: '货确认单编码/发货单编码/客户名称/批次号'
+          placeholder: '货确认单编码/发货单编码/客户名称/批次号'
         },
         {
           label: '确认单编码:',

+ 1 - 1
src/views/saleManage/saleOrder/invoiceConfirm/index.vue

@@ -433,7 +433,7 @@
             variables: {
               businessCode: res.docNo,
               businessName: res.contactName,
-              businessType: '货确认单'
+              businessType: '货确认单'
             }
             // callBackMethodType : '1',
             // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',

+ 1 - 1
src/views/saleManage/saleOrder/palletManagement/components/detailDialog.vue

@@ -78,7 +78,7 @@
           {
             minWidth: 160,
             prop: 'confirmNo',
-            label: '货确认单编码',
+            label: '货确认单编码',
             showOverflowTooltip: true,
             align: 'center'
           },

+ 1 - 1
src/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog.vue

@@ -76,7 +76,7 @@
               placeholder="请输入"
             />
           </el-form-item>
-          <el-form-item v-else label="发货单/货确认单" prop="sendNo">
+          <el-form-item v-else label="发货单/货确认单" prop="sendNo">
             <el-input
               clearable
               v-model="form.sendNo"

+ 1 - 1
src/views/saleManage/saleOrder/returnGoods/components/sendListMultipleDialog.vue

@@ -47,7 +47,7 @@
             </template>
           </ele-pro-table>
         </el-tab-pane>
-        <el-tab-pane label="货确认单" name="2">
+        <el-tab-pane label="货确认单" name="2">
           <ele-pro-table
             ref="table1"
             :selectable="getSelectAble"