"订单"改成“任务单”

src/api/sale.js

@@ -26,7 +26,7 @@ export function revokePurchase (data) {
   })
 }
 
-// 订单列表
+// 任务单列表
 export function getOrderList (params) {
   return request({
     url: request.adornUrl(`/biz-service/order/list`),
@@ -35,7 +35,7 @@ export function getOrderList (params) {
   })
 }
 
-// 订单详情
+// 任务单详情
 export function getOrderDetail (id) {
   return request({
     url: request.adornUrl(`/biz-service/order/info/${id}`),
@@ -68,7 +68,7 @@ export function getProductionDetail (id) {
   })
 }
 
-// 订单发货
+// 任务单发货
 export function deliverOrder (data) {
   return request({
     url: request.adornUrl(`/biz-service/order/deliver`),
@@ -77,7 +77,7 @@ export function deliverOrder (data) {
   })
 }
 
-// 订单送达
+// 任务单送达
 export function arrivedOrder (data) {
   return request({
     url: request.adornUrl(`/biz-service/order/arrived`),
@@ -179,7 +179,7 @@ export function getSupplierDetail (id) {
   })
 }
 
-// 撤回订单
+// 撤回任务单
 export function revokeOrder (data) {
   return request({
     url: request.adornUrl(`/biz-service/order/revoke`),

src/api/trace.js

@@ -1,6 +1,6 @@
 import request from '@/utils/httpRequest'
 
-// 根据订单编码追溯
+// 根据任务单编码追溯
 export function getOrderByCode (params) {
   return request({
     url: request.adornUrl(`/biz-service/trace/orderList`),
@@ -18,7 +18,7 @@ export function getProductByCode (params) {
   })
 }
 
-// 根据订单 Id 获取订单详情
+// 根据任务单 Id 获取任务单详情
 export function getOrderDetailById (orderId) {
   return request({
     url: request.adornUrl(`/biz-service/trace/infoOrderCode/${orderId}`),

src/views/modules/cus/communicate-add-or-update.vue

@@ -272,7 +272,7 @@
             >
               <template slot-scope="scope">
                 <span>{{
-                taskTypeOption.findIndex((t) => t.value == scope.row.taskType) > -1 
+                taskTypeOption.findIndex((t) => t.value == scope.row.taskType) > -1
                 ? taskTypeOption.find((t) => t.value == scope.row.taskType).label
                 : ''
               }}</span>
@@ -295,7 +295,7 @@
             >
               <template slot-scope="scope">
                  <span>{{
-                rankTypeOption.findIndex((t) => t.value == scope.row.ranks) > -1 
+                rankTypeOption.findIndex((t) => t.value == scope.row.ranks) > -1
                 ? rankTypeOption.find((t) => t.value == scope.row.ranks).label
                 : ''
               }}</span>
@@ -566,7 +566,7 @@ export default {
           // }
           // if (this.dataForm.coType === "1") {
           //   if (this.cusRCommProductVOS.length === 0) {
-          //     this.$message.error("请选择订单产品明细");
+          //     this.$message.error("请选择任务单产品明细");
           //     return;
           //   }
           // }

src/views/modules/cus/contract-record-add-or-update.vue

@@ -265,7 +265,7 @@ export default {
               return
             }
             if (this.productList.length === 0) {
-              this.$message.error('请选择订单产品明细')
+              this.$message.error('请选择任务单产品明细')
               return
             }
             this.dataForm.cusCBookProducts = this.productList

src/views/modules/cus/contract-statistics.vue

@@ -66,7 +66,7 @@
           header-align="center"
           align="center"
           min-width="120"
-          label="历史订单合同总金额">
+          label="历史任务单合同总金额">
         </el-table-column>
         <el-table-column
           prop="notes"

src/views/modules/finance/customer-account-add-or-update.vue

@@ -113,11 +113,11 @@ export default {
       typeState: [ // 账款类别映射关系
         {
           code: '1',
-          value: '订单收款'
+          value: '任务单收款'
         },
         {
           code: '2',
-          value: '订单退款'
+          value: '任务单退款'
         }
       ],
       currencyType: [ // 币种映射关系

src/views/modules/finance/customer-account-detail.vue

@@ -50,11 +50,11 @@
         typeState: [ // 账款类别映射关系
           {
             code: '1',
-            value: '订单收款'
+            value: '任务单收款'
           },
           {
             code: '2',
-            value: '订单退款'
+            value: '任务单退款'
           }
         ],
         currencyType: [ // 币种映射关系

src/views/modules/finance/customer-account-list.vue

@@ -135,11 +135,11 @@
         typeState: [ // 账款类别映射关系
           {
             code: '1',
-            value: '订单收款'
+            value: '任务单收款'
           },
           {
             code: '2',
-            value: '订单退款'
+            value: '任务单退款'
           }
         ]
       }

src/views/modules/home/admin.vue

@@ -163,7 +163,7 @@
                     prop="contractNumber"
                     label="合同号"
                   ></el-table-column>
-                  <!-- <el-table-column prop="orderCode" label="订单号"></el-table-column> -->
+                  <!-- <el-table-column prop="orderCode" label="任务单号"></el-table-column> -->
                   <el-table-column
                     prop="remainTime"
                     label="剩余时间（天）"

src/views/modules/home/customer.vue

@@ -85,7 +85,7 @@
                             prop="contractNumber"
                             label="合同号"
                           ></el-table-column>
-                          <!-- <el-table-column prop="orderCode" label="订单号"></el-table-column> -->
+                          <!-- <el-table-column prop="orderCode" label="任务单号"></el-table-column> -->
                           <el-table-column
                             prop="remainTime"
                             label="剩余时间（天）"

src/views/modules/msg-center/approve.vue

@@ -1,4 +1,4 @@
-<!-- 订单 -->
+<!-- 任务单 -->
 <template>
   <div class="order">
     <template v-if="!addOrUpdateVisible">
@@ -181,7 +181,7 @@
             code: 'contract_review', value: '合同评审'
           },
           {
-            code: 'sale_order_flow', value: '订单评审'
+            code: 'sale_order_flow', value: '任务单评审'
           },
           {
             code: 'sale_purchase_flow', value: '采购申请'

src/views/modules/order/dispatch-arrived.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <div class="my-title">订单送达</div>
+      <div class="my-title">任务单送达</div>
       <!-- 表单 -->
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
         <el-row class="my-row">

src/views/modules/order/order-add-or-update.vue

@@ -486,7 +486,7 @@
       salesmanChanged (val) {
         this.dataForm.salesmanId = val
       },
-      // 添加订单产品明细
+      // 添加任务单产品明细
       addProductHandle () {
         this.productListVisible = true
         this.$nextTick(() => {

src/views/modules/order/order-amount-mask-setting.vue

@@ -1,7 +1,7 @@
 <!-- 任务单金额屏蔽 -->
 <template>
     <div>
-        <div class="my-title">订单金额屏蔽设置</div>
+        <div class="my-title">任务单金额屏蔽设置</div>
         <!-- 表单 -->
         <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
           <el-row class="my-row">

src/views/modules/order/order-detail.vue

@@ -25,7 +25,7 @@
         <approve-component ref="approve" @approveFinished="approveFinished"/>
       </div>
       <e-desc title="基本信息" column="3">
-        <e-desc-item label="公司订单编码">{{dataForm.orderCode}}</e-desc-item>
+        <e-desc-item label="公司任务单编码">{{dataForm.orderCode}}</e-desc-item>
         <e-desc-item label="合同号">{{dataForm.contractNumber}}</e-desc-item>
         <e-desc-item label="客户名称">{{dataForm.customerName}}</e-desc-item>
 
@@ -43,7 +43,7 @@
           </div>
         </e-desc-item>
       </e-desc>
-      <e-desc title="订单产品明细">
+      <e-desc title="任务单产品明细">
         <el-table
           :data="productDetails"
           border
@@ -83,7 +83,7 @@
             align="center"
             min-width="120"
             :show-tooltip-when-overflow="true"
-            label="订单产品编号">
+            label="任务单产品编号">
           </el-table-column>
           <el-table-column
             prop="price"
@@ -191,7 +191,7 @@ export default {
             // 流程图展示
             dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
             dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
-            // 订单产品明细
+            // 任务单产品明细
             if (data.data.saleROrderProductList) {
               this.productDetails = data.data.saleROrderProductList
             }

src/views/modules/order/order.vue

@@ -87,7 +87,7 @@
           label="合同交期">
         </el-table-column>
         <el-table-column
-          prop="-"
+          prop="state"
           header-align="center"
           align="center"
           min-width="120"
@@ -95,7 +95,7 @@
           label="评审状态">
         </el-table-column>
         <el-table-column
-          prop="-"
+          prop="orderState"
           header-align="center"
           align="center"
           min-width="120"
@@ -285,7 +285,7 @@
         const item1 = this.optionsState.find((item) => item.code === row.state.toString())
         return item1 ? item1.value : ''
       },
-      // 转换属性“订单状态”
+      // 转换属性“任务单状态”
       formatOrderState (row) {
         if (!row.orderState) return ''
         const item1 = this.optionsOrderState.find((item) => item.code === row.orderState.toString())
@@ -343,9 +343,9 @@
           this.$refs.noticeChangeSetting.init()
         })
       },
-      // 撤回订单
+      // 撤回任务单
       cancelOrder (row) {
-        this.$confirm(`确定撤回订单${row.orderCode}?`, '提示', {
+        this.$confirm(`确定撤回任务单${row.orderCode}?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

src/views/modules/product/template-add-or-update-v2.vue

@@ -71,7 +71,7 @@
       onChose () {
         this.visible = false
       },
-      // 初始化：type: 1 沟通产品明细/合同台账产品明细，2 订单产品明细
+      // 初始化：type: 1 沟通产品明细/合同台账产品明细，2 任务单产品明细
       init (type, dataForm, techType) {
         this.bizType = techType ? 3 : type
         if (dataForm) {

src/views/modules/product/template-add-or-update.vue

@@ -23,7 +23,7 @@
         </el-row>
         <el-row class="my-row" v-if="bizType === 2">
           <el-form-item label="生产编号" prop="productNumber">
-            <el-input v-model="dataForm.productNumber" placeholder="订单编号" :disabled="bizType === 3" ></el-input>
+            <el-input v-model="dataForm.productNumber" placeholder="任务单编号" :disabled="bizType === 3" ></el-input>
           </el-form-item>
         </el-row>
         <el-row class="my-row" v-if="bizType === 2">
@@ -103,7 +103,7 @@
       onChose () {
         this.visible = false
       },
-      // 初始化：type: 1 沟通产品明细/合同台账产品明细，2 订单产品明细
+      // 初始化：type: 1 沟通产品明细/合同台账产品明细，2 任务单产品明细
       init (type, dataForm, techType) {
         this.bizType = techType ? 3 : type
         if (dataForm) {

src/views/modules/production/damage-details.vue

@@ -33,7 +33,7 @@
         <e-desc-item label="产品编号">{{dataForm.prodCode}}</e-desc-item>
         <e-desc-item label="状态">{{formatState(dataForm)}}</e-desc-item>
 
-        <e-desc-item label="订单编码">{{dataForm.orderCode}}</e-desc-item>
+        <e-desc-item label="任务单编码">{{dataForm.orderCode}}</e-desc-item>
         <e-desc-item label="工艺名称" span="2">{{dataForm.techName}}</e-desc-item>
 
         <e-desc-item label="报损工序">{{dataForm.nodeName}}</e-desc-item>

src/views/modules/trace/order-detail.vue

@@ -29,7 +29,7 @@
         <approve-component ref="approve" @approveFinished="approveFinished"/>
       </div>
       <e-desc title="基本信息" column="3">
-        <e-desc-item label="公司订单编码">{{dataForm.orderCode}}</e-desc-item>
+        <e-desc-item label="公司任务单编码">{{dataForm.orderCode}}</e-desc-item>
         <e-desc-item label="合同号">{{dataForm.contractNumber}}</e-desc-item>
         <e-desc-item label="客户名称">{{dataForm.customerName}}</e-desc-item>
 
@@ -40,7 +40,7 @@
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
       </e-desc>
 
-      <e-desc title="订单产品明细">
+      <e-desc title="任务单产品明细">
         <el-table
           :data="productDetails"
           border
@@ -196,7 +196,7 @@
                 })
               })
             }
-            // 订单产品明细
+            // 任务单产品明细
             if (data.data.prodProductionList) {
               this.productDetails = data.data.prodProductionList
             }

src/views/modules/trace/order-list.vue

@@ -1,7 +1,7 @@
-<!-- 订单 -->
+<!-- 任务单 -->
 <template>
   <div class="order-list" >
-    <div class="my-title" v-if="!detailVisible">订单追溯</div>
+    <div class="my-title" v-if="!detailVisible">任务单追溯</div>
     <div v-show="!detailVisible">
       <template>
       <el-table
@@ -22,7 +22,7 @@
           align="center"
           min-width="180"
           :show-tooltip-when-overflow="true"
-          label="订单编码">
+          label="任务单编码">
         </el-table-column>
         <el-table-column
           prop="customerName"
@@ -123,7 +123,7 @@
         type: Array,
         default: []
       },
-      // 订单编码
+      // 任务单编码
       orderCode: {
         type: String,
         default: ''
@@ -212,7 +212,7 @@
       selectionChangeHandle (val) {
         this.dataListSelections = val
       },
-      // 转换属性“订单状态”
+      // 转换属性“任务单状态”
       formatOrderState (row) {
         if (!row.orderState) return ''
         const item1 = this.optionsOrderState.find((item) => item.code === row.orderState.toString())

src/views/modules/trace/product-list.vue

@@ -97,7 +97,7 @@
         type: Array,
         default: []
       },
-      // 订单编码
+      // 任务单编码
       productCode: {
         type: String,
         default: ''

src/views/modules/trace/search.vue

@@ -6,7 +6,7 @@
         <div>
           <el-input :placeholder="codePlaceHoler" v-model.trim="code" class="input-with-select">
             <el-select v-model="type" slot="prepend" placeholder="请选择">
-              <el-option label="订单" value="1"></el-option>
+              <el-option label="任务单" value="1"></el-option>
               <el-option label="产品" value="2"></el-option>
             </el-select>
             <el-button slot="append" type="primary" ref="searchBtn" :loading="searchloading" @click="search()">追溯</el-button>
@@ -14,12 +14,12 @@
         </div>
       </template>
     </div>
-    
+
     <!-- 弹窗, 新增 / 修改 -->
-    <order-list v-if="orderListVisible" :defaultList="defaultOrderList" :orderCode="code" :defaultTotalPage="defaultOrderTotal" ref="orderList" @onChose="onChose"/>      
+    <order-list v-if="orderListVisible" :defaultList="defaultOrderList" :orderCode="code" :defaultTotalPage="defaultOrderTotal" ref="orderList" @onChose="onChose"/>
     <product-list v-if="productListVisible" :defaultList="defaultProductList" :productCode="code" :defaultTotalPage="defaultProductTotal" ref="productList" @onChose="onChose"></product-list>
   </div>
-  
+
 </template>
 
 
@@ -53,12 +53,12 @@ export default {
     },
     search () {
       if (this.code === '') {
-        this.$message.error('请输入订单/产品编码')
+        this.$message.error('请输入任务单/产品编码')
         return
       }
       this.searchloading = true
       let that = this
-      // 订单追溯
+      // 任务单追溯
       if (this.type === '1') {
         let params = {orderCode: this.code}
         getOrderByCode(params).then(({data}) => {
@@ -106,7 +106,7 @@ export default {
   computed: {
     codePlaceHoler () {
       return this.type === '1'
-        ? '请输入订单编码'
+        ? '请输入任务单编码'
         : '请输入产品编号'
     }
   }