Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/md/paymentClause.js

@@ -38,7 +38,7 @@ export function updateClause(data) {
 // 删除销售订单付款条件
 export function delClause(id) {
   return request({
-    url: '/md/clause/' + id,
+    url: '/md/payment/' + id,
     method: 'delete'
   })
 }

src/views/mes/md/client/index.vue

@@ -171,7 +171,7 @@
     />
 
     <!-- 添加或修改客户对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px">
+    <el-dialog :title="title" :visible.sync="open" width="950px">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="10">
           <el-col :span="8">
@@ -233,7 +233,7 @@
           <el-tab-pane label="客户基本信息" name="BaseInfo">
             <BaseInfo ref="BaseInfo" :form="form"/>
           </el-tab-pane>
-          <el-tab-pane label="地址信息" name="AddrInfo">
+<!--          <el-tab-pane label="地址信息" name="AddrInfo">
             <AddrInfo ref="AddrInfo" :form="form"/>
           </el-tab-pane>
           <el-tab-pane label="交货信息" name="DeliveryInfo">
@@ -241,7 +241,7 @@
           </el-tab-pane>
           <el-tab-pane label="财务信息" name="FinanceInfo">
             <FinanceInfo ref="FinanceInfo" :form="form"/>
-          </el-tab-pane>
+          </el-tab-pane>-->
           <el-tab-pane label="客户联系人" name="ClientContact">
             <ClientContact ref="ClientContact" :clientId="form.clientId"/>
           </el-tab-pane>

src/views/mes/order/sales/index.vue

@@ -29,7 +29,7 @@
       </el-form-item>
       <el-form-item label="跟单人" prop="merchandiser">
         <el-select v-model="queryParams.merchandiser" clearable filterable remote :remote-method="getUserList" placeholder="请选择跟单人">
-          <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
+          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.nickName"/>
         </el-select>
       </el-form-item>
       <el-form-item label="订单状态" prop="state">
@@ -124,14 +124,14 @@
             v-hasPermi="['od:salesOrder:remove']"
           >删除
           </el-button>
-<!--          <el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-refresh"
             @click="onSync(scope.row)"
             v-hasPermi="['od:salesOrder:edit']"
           >同步
-          </el-button>-->
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -221,13 +221,7 @@ export default {
     },
     /** 同步数据 */
     onSync(row) {
-      const ids = row.id || this.ids
-      this.$modal.confirm('是否确认同步销售订单编号为"' + ids + '"的数据项？').then(() => {
-        syncOrder(ids).then(() => {
-          this.getList()
-          this.$modal.msgSuccess('删除成功')
-        })
-      })
+      this.$router.push('/order/sales/sync?id=' + row.id)
     },
     /** 删除按钮操作 */
     handleDelete(row) {