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

src/views/mes/md/client/components/ClientContact.vue

@@ -8,7 +8,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:contact:add']"
         >新增
         </el-button>
       </el-col>
@@ -20,7 +19,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:contact:edit']"
         >修改
         </el-button>
       </el-col>
@@ -32,43 +30,30 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:contact:remove']"
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['md:contact:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="品牌名称" align="center" prop="brandName" width="150"/>
-      <el-table-column label="部门" align="center" prop="department" width="100"/>
-      <el-table-column label="职位" align="center" prop="position" width="100"/>
-      <el-table-column label="联系人" align="center" prop="contact" width="100"/>
-      <el-table-column label="电话号码" align="center" prop="tel" width="150"/>
-      <el-table-column label="email" align="center" prop="email" width="200"/>
-      <el-table-column label="经营类型" align="center" prop="businessType" width="100"/>
-      <el-table-column label="工厂代号" align="center" prop="factoryCode" width="100"/>
-      <el-table-column label="跟单员" align="center" prop="merchandiser" width="100"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="品牌名称" prop="brandName" width="150"/>
+      <el-table-column label="部门" prop="department" width="100"/>
+      <el-table-column label="职位" prop="position" width="100"/>
+      <el-table-column label="联系人" prop="contact" width="100"/>
+      <el-table-column label="电话号码" prop="tel" width="150"/>
+      <el-table-column label="email" prop="email" width="200"/>
+      <el-table-column label="经营类型" prop="businessType" width="100"/>
+      <el-table-column label="工厂代号" prop="factoryCode" width="100"/>
+      <el-table-column label="跟单员" prop="merchandiser" width="100"/>
+      <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:contact:edit']"
           >修改
           </el-button>
           <el-button
@@ -76,7 +61,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:contact:remove']"
           >删除
           </el-button>
         </template>

src/views/mes/md/client/components/ClientItem.vue

@@ -9,7 +9,6 @@
           size="mini"
           @click="handleAdd"
           :disabled="!queryParams.clientId"
-          v-hasPermi="['md:clientItem:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -20,7 +19,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:clientItem:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -31,7 +29,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:clientItem:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -42,21 +39,19 @@
       <el-table-column label="产品" prop="itemName" />
       <el-table-column label="客户产品名称" prop="clientItemName" />
       <el-table-column label="客户产品编码" prop="clientItemCode" />
-      <el-table-column label="操作" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:clientItem:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:clientItem:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/mes/md/client/components/PaymentRelation.vue

@@ -8,7 +8,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:relation:add']"
         >新增
         </el-button>
       </el-col>
@@ -20,7 +19,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:relation:edit']"
         >修改
         </el-button>
       </el-col>
@@ -32,39 +30,23 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:relation:remove']"
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['md:relation:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="客户id" align="center" prop="clientId"/>
-      <el-table-column label="支付方客户ID" align="center" prop="relatedClientId"/>
-      <el-table-column label="创建人" align="center" prop="createBy"/>
-      <el-table-column label="创建时间" align="center" prop="createTime"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="支付方客户编码" prop="relatedCode"/>
+      <el-table-column label="支付方客户名称" prop="relatedName"/>
+      <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:relation:edit']"
           >修改
           </el-button>
           <el-button
@@ -72,7 +54,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:relation:remove']"
           >删除
           </el-button>
         </template>
@@ -90,8 +71,10 @@
     <!-- 添加或修改客户付款信息关联对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="支付方客户ID" prop="relatedClientId" label-width="8em">
-          <el-input v-model="form.relatedClientId" placeholder="请输入支付方客户ID"/>
+        <el-form-item label="支付方客户" prop="relatedClientId" label-width="8em">
+          <el-select v-model="form.relatedClientId" placeholder="请选择支付方客户" @focus="getClientList()" clearable filterable remote :remote-method="getClientList">
+            <el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientName"/>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -104,6 +87,7 @@
 
 <script>
 import {listRelation, getRelation, delRelation, addRelation, updateRelation} from "@/api/mes/md/clientPaymentRelation";
+import { listClient } from '@/api/mes/md/client'
 
 export default {
   name: "Relation",
@@ -139,6 +123,7 @@ export default {
       },
       // 表单参数
       form: {},
+      clientList: [],
       // 表单校验
       rules: {
         relatedClientId: [{
@@ -147,9 +132,6 @@ export default {
       }
     };
   },
-  created() {
-    this.getList();
-  },
   methods: {
     /** 查询客户付款信息关联列表 */
     getList() {
@@ -249,6 +231,10 @@ export default {
         ...this.queryParams
       }, `relation_${new Date().getTime()}.xlsx`)
     },
+
+    getClientList(key) {
+      listClient({ clientName: key, pageNum: 1, pageSize: 100 }).then(res => this.clientList = res.rows)
+    },
     init(form) {
       if (!form.clientId) return
       this.queryParams.clientId = form.clientId

src/views/mes/md/client/components/UrgeEmail.vue

@@ -9,7 +9,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:email:add']"
         >新增
         </el-button>
       </el-col>
@@ -21,7 +20,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:email:edit']"
         >修改
         </el-button>
       </el-col>
@@ -33,42 +31,28 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:email:remove']"
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['md:email:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="emailList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="客户id" align="center" prop="clientId"/>
-      <el-table-column label="邮箱" align="center" prop="email"/>
-      <el-table-column label="联系人" align="center" prop="contact"/>
-      <el-table-column label="是否启用" align="center" prop="enableFlag">
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="邮箱" prop="email"/>
+      <el-table-column label="联系人" prop="contact"/>
+      <el-table-column label="是否启用" prop="enableFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:email:edit']"
           >修改
           </el-button>
           <el-button
@@ -76,7 +60,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:email:remove']"
           >删除
           </el-button>
         </template>

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

@@ -533,10 +533,10 @@ export default {
     },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
-      debugger;
       if(autoGenFlag){
         genCode('CLIENT_CODE').then(response =>{
           this.form.clientCode = response;
+          this.$forceUpdate()
         });
       }else{
         this.form.clientCode = null;

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

@@ -125,14 +125,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>

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

@@ -254,7 +254,7 @@
       </el-tab-pane>
     </el-tabs>
 
-    <el-dialog :visible="showEditDetail" title="订单详情" width="1200px">
+    <el-dialog :visible.sync="showEditDetail" title="订单详情" width="1200px">
       <el-form :model="itemForm" ref="itemForm" :rules="itemRules" label-width="100px">
         <el-row :gutter="10">
           <el-col :span="8">