md

src/api/emis/emisCustomerUser.js

@@ -1,9 +1,17 @@
 import request from '@/utils/request'
 
 // 查询快递客户用户列表
-export function listEmisCustomerUser(query) {
+export function listMonthUser(query) {
   return request({
-    url: '/emis/emisCustomerUser/list',
+    url: '/emis/emisCustomerUser/listMonthUser',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listMoneyUser(query) {
+  return request({
+    url: '/emis/emisCustomerUser/listMoneyUser',
     method: 'get',
     params: query
   })
@@ -17,19 +25,39 @@ export function getEmisCustomerUser(id) {
   })
 }
 
-// 新增快递客户用户
+// 新增月结客户
-export function addEmisCustomerUser(data) {
+export function addMonthUser(data) {
   return request({
-    url: '/emis/emisCustomerUser',
+    url: '/emis/emisCustomerUser/addMonthUser',
     method: 'post',
     data: data
   })
 }
 
-// 修改快递客户用户
+// 修改现金用户
-export function updateEmisCustomerUser(data) {
+export function editMoneyUser(data) {
   return request({
-    url: '/emis/emisCustomerUser',
+    url: '/emis/emisCustomerUser/editMoneyUser',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 新增月结客户
+export function addMoneyUser(data) {
+  return request({
+    url: '/emis/emisCustomerUser/addMoneyUser',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 修改月结用户
+export function editMonthUser(data) {
+  return request({
+    url: '/emis/emisCustomerUser/editMonthUser',
     method: 'put',
     data: data
   })

src/views/emis/emisCustomerUser/batchUpdateForm.vue

@@ -89,7 +89,7 @@
 </template>
 
 <script>
-import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
+import {  editMonthUser } from "@/api/emis/emisCustomerUser";
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
@@ -242,14 +242,14 @@ export default {
           console.log(this.ids);
           if(this.ids.length==0){
             this.form.id=item;
-            await updateEmisCustomerUser(this.form).then(response => {
+            await editMonthUser(this.form).then(response => {
-                console.log(response);
+                // console.log(response);
               });
           }else{
             this.ids.forEach(async item => {
                 this.form.id=item;
-                await updateEmisCustomerUser(this.form).then(response => {
+                await editMonthUser(this.form).then(response => {
-                  console.log(response);
+                  // console.log(response);
                 });
             });
           }

src/views/emis/emisCustomerUser/moneyUserForm.vue

@@ -273,7 +273,7 @@
 </template>
 
 <script>
-import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
+import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addMoneyUser, editMoneyUser } from "@/api/emis/emisCustomerUser";
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
@@ -421,7 +421,7 @@ export default {
         mobile: null,
         customerType: '1',
         settledType: '1',
-        userType: null,
+        userType: '1',
         company: null,
         deptId: null,
         avatar: null,
@@ -474,13 +474,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateEmisCustomerUser(this.form).then(response => {
+            editMoneyUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.$emit("on-changed");
             });
           } else {
-            addEmisCustomerUser(this.form).then(response => {
+            addMoneyUser(this.form).then(response => {
-               this.$modal.msgSuccess("修改成功");
+               this.$modal.msgSuccess("新增成功");
                this.$emit("on-changed");
             });
           }

src/views/emis/emisCustomerUser/moneyUserList.vue

@@ -222,7 +222,7 @@
 </template>
 
 <script>
-import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
+import { listMoneyUser, delEmisCustomerUser } from "@/api/emis/emisCustomerUser";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import moneyUserForm from '@/views/emis/emisCustomerUser/moneyUserForm';
 
@@ -305,7 +305,7 @@ export default {
         this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
         this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
       }
-      listEmisCustomerUser(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listMoneyUser(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisCustomerUserList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/emis/emisCustomerUser/monthUserForm.vue

@@ -208,7 +208,7 @@
 </template>
 
 <script>
-import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
+import { getEmisCustomerUser, addMonthUser, editMonthUser } from "@/api/emis/emisCustomerUser";
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
@@ -369,7 +369,7 @@ export default {
         mobile: null,
         customerType: '2',
         settledType: '2',
-        userType: null,
+        userType: '2',
         company: null,
         deptId: null,
         avatar: null,
@@ -426,12 +426,12 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             this.form.company=this.form.customerName;
-            updateEmisCustomerUser(this.form).then(response => {
+            editMonthUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.$emit("on-changed");
             });
           } else {
-            addEmisCustomerUser(this.form).then(response => {
+            addMonthUser(this.form).then(response => {
                this.$modal.msgSuccess("新增成功");
                this.$emit("on-changed");
             });

src/views/emis/emisCustomerUser/monthUserList.vue

@@ -10,6 +10,16 @@
           @input="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="月结卡号" prop="company">
+        <el-input
+          v-model="queryParams.monthlyPayCode"
+          :placeholder="$t('月结卡号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="寄件人" prop="customerName">
         <el-input
           v-model="queryParams.customerName"
@@ -56,7 +66,7 @@
               <el-option key="1" label="是" :value="1" />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('发送短信')" prop="blOpenOms">
+          <el-form-item :label="$t('发送短信')" prop="blSms">
             <el-select v-model="queryParams.blSms" no-match-text filterable :placeholder="$t('启用状态')" @change="handleQuery">
               <el-option key="0" label="否" :value="0" />
               <el-option key="1" label="是" :value="1" />
@@ -247,7 +257,7 @@
 </template>
 
 <script>
-import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
+import { listMonthUser, delEmisCustomerUser } from "@/api/emis/emisCustomerUser";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisCustomerUserView from '@/views/emis/emisCustomerUser/emisCustomerUserView';
 import monthUserForm from '@/views/emis/emisCustomerUser/monthUserForm';
@@ -345,7 +355,7 @@ export default {
         this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
         this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
       }
-      listEmisCustomerUser(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listMonthUser(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisCustomerUserList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/emis/emisProblemType/index.vue

@@ -121,12 +121,8 @@
       <el-table-column label="顺延天数" align="center" prop="delayDay" min-width="100" />
       <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
           <template slot-scope="scope">
-          <el-switch
+              <el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
-            v-model="scope.row.status"
+              <el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
-            active-value="0"
-            inactive-value="1"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
           </template>
         </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
@@ -209,13 +205,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-              <el-form-item label="是否启用" prop="status">
+              <el-form-item label="启用状态" prop="status">
                 <el-radio-group v-model="form.status">
-                <el-radio
+                    <el-radio :label="'1'">启用</el-radio>
-                  v-for="dict in dict.type.sys_normal_disable"
+                    <el-radio :label="'0'">停用</el-radio>
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
                   </el-radio-group>
              </el-form-item>
           </el-col>
@@ -241,14 +234,14 @@
     </el-dialog>
 
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
+    <!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
       <emisProblemTypeForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisProblemTypeForm>
-    </el-dialog>
+    </el-dialog> -->
-
 
+<!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  append-to-body>
         <emisProblemTypeView :id="id" ></EmisProblemTypeView>
-    </el-dialog>
+    </el-dialog> -->
 
   </div>
 </template>