diff --git a/src/api/emis/emisCustomerUser.js b/src/api/emis/emisCustomerUser.js
index a04a9366..57d7e37e 100644
--- a/src/api/emis/emisCustomerUser.js
+++ b/src/api/emis/emisCustomerUser.js
@@ -53,6 +53,20 @@ export function addMoneyUser(data) {
   })
 }
 
+// 用户密码重置
+export function resetCustomerUserPwd(id, password) {
+  const data = {
+    id,
+    password
+  }
+  return request({
+    url: '/emis/emisCustomerUser/resetCustomerUserPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+
 
 // 修改月结用户
 export function editMonthUser(data) {
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index 6d876edd..0211474f 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -174,8 +174,8 @@
           <el-col :span="12">
             <el-form-item label="启用状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio :label="'1'">是</el-radio>
-                <el-radio :label="'0'">否</el-radio>
+                <el-radio :label="'1'">启用</el-radio>
+                <el-radio :label="'0'">停用</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 98af2fc3..851cc055 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -126,6 +126,19 @@
                   v-hasPermi="['emis:emisCustomerUser:edit']"
                 >批量修改</el-button>
               </el-col>
+
+              <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-edit"
+                    size="mini"
+                    :disabled="single"
+                    @click="handleResetPwd"
+
+                  >密码重置</el-button>
+                </el-col>
+                <!-- v-hasPermi="['emis:emisCustomerUser:edit']" -->
               <el-col :span="1.5">
                 <el-button
                   type="danger"
@@ -298,7 +311,7 @@
 </template>
 
 <script>
-import { listMonthUser, delEmisCustomerUser,addMonthUser } from "@/api/emis/emisCustomerUser";
+import { listMonthUser, delEmisCustomerUser,addMonthUser ,resetCustomerUserPwd} from "@/api/emis/emisCustomerUser";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisCustomerUserView from '@/views/emis/emisCustomerUser/emisCustomerUserView';
 import monthUserForm from '@/views/emis/emisCustomerUser/monthUserForm';
@@ -439,6 +452,22 @@ export default {
        this.titleForm = "修改月结客户";
     },
 
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      const id= row.id || this.ids[0];
+
+      this.$confirm('密码将重置为初始密码:123456 吗?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+      }).then(() => {
+        resetCustomerUserPwd(id,'123456').then(response => {
+            this.$modal.msgSuccess("重置成功");
+          });
+      }).catch(() => {
+      })
+    },
+
 
     handleView(row) {
        this.id=row.id;
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index 6a7b3180..1d868170 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -107,6 +107,10 @@
            />
          </el-form-item>
 
+         <el-form-item label="问题件类型" prop="problemType">
+            <ProblemTypePicker v-model="queryParams.problemType"  ></ProblemTypePicker>
+          </el-form-item>
+
      </SearchForm>
 
 
@@ -400,6 +404,7 @@
             <span v-else></span>
          </template>
      </el-table-column> -->
+     <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
 
      <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :show-overflow-tooltip="true">
        <template slot-scope="scope">
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index 46a92a61..4b19f803 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -222,7 +222,7 @@
                   </el-form-item>
 
                   <el-form-item label="取件方式" prop="pickupMethod">
-                      <el-select v-model="queryParams.pickupMethod" placeholder="请选择">
+                      <el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择">
                         <el-option
                           v-for="dict in dict.type.emis_qujian_fangshi"
                           :key="dict.value"
@@ -236,8 +236,8 @@
                 <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
               </el-form-item>
 
-              <el-form-item label="收款状态" prop="pickupMethod">
-                      <el-select v-model="queryParams.paymentStatus" placeholder="请选择">
+              <el-form-item label="收款状态" prop="paymentStatus">
+                      <el-select v-model="queryParams.paymentStatus" clearable placeholder="请选择">
                         <el-option
                           v-for="dict in dict.type.emis_payment_status"
                           :key="dict.value"
@@ -864,6 +864,7 @@ export default {
         timezoneOffset: null,
         delFlag: null,
         remark: null,
+        paymentStatus:null,
         params:{
           blSign:null,
           expireNotSign:null,
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index c82486c1..a86dd4f8 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -215,7 +215,7 @@
                   </el-form-item>
 
                   <el-form-item label="取件方式" prop="pickupMethod">
-                      <el-select v-model="queryParams.pickupMethod" placeholder="请选择">
+                      <el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择">
                         <el-option
                           v-for="dict in dict.type.emis_qujian_fangshi"
                           :key="dict.value"
@@ -229,8 +229,8 @@
                 <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
               </el-form-item>
 
-              <el-form-item label="收款状态" prop="pickupMethod">
-                      <el-select v-model="queryParams.paymentStatus" placeholder="请选择">
+              <el-form-item label="收款状态" prop="paymentStatus">
+                      <el-select v-model="queryParams.paymentStatus" clearable placeholder="请选择">
                         <el-option
                           v-for="dict in dict.type.emis_payment_status"
                           :key="dict.value"
@@ -847,6 +847,7 @@ export default {
         timezoneOffset: null,
         delFlag: null,
         remark: null,
+        paymentStatus:null,
         params:{
           blSign:null,
           expireNotSign:null,