Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-web

src/views/inventoryControl/newInventory/warehouseManagement/index.vue

@@ -89,7 +89,7 @@ function dateChangeHandle(val: any) {
   }
 }
 function handleBeforeChange1(value, arg1) {
-  console.log(value, arg1);
+  // console.log(value, arg1);
   BaseService.post('/invw/api/warehouse/check', { id: arg1.id, isCheck: value }).then((res: any) => {
     if (res && res.statusCode === 0) {
       if (value == '1') {
@@ -105,7 +105,7 @@ function handleBeforeChange1(value, arg1) {
 }
 function getUpperWarehouseIdList() {
   BaseService.post('/invw/api/warehouse/getWarehouseIdNames', {
-    "id": "9999",
+    "id": "999",
     "type": "8"
   }).then((res: any) => {
     if (res && res.statusCode === 0) {
@@ -144,6 +144,7 @@ function toEdit(row) {
       crudRef.value.form={
         ...data
       }
+      customSelectorSelection(row.agencyId, 'agencyId',null, null, null)
     })
   }
 

src/views/inventoryControl/putInstorage/addOrUpdate.vue

@@ -425,9 +425,9 @@ function validHandle(row: IObject, index) {
             if (res && res.code === 0) {
                 let bizContent = res.data
                 let data = {
-                    failTotal: bizContent.failTotal,
-                    successTotal: bizContent.successTotal,
-                    total: bizContent.total,
+                     failTotal: bizContent.failTotal,
+                     successTotal: bizContent.successTotal,
+                     total: bizContent.total,
                 }
                 summary.value = true;
                 addForm.value.detailList[index] = {
@@ -511,6 +511,7 @@ function validateEndId(rule: any, value: string, callback: (e?: Error) => any) {
     } else if (inventoryType === "OBU" && length !== 16) {
         return callback(new Error("OBU编号位数是16!"));
     }
+    
     if (
         val &&
         addForm.value.detailList[index].startId &&
@@ -518,6 +519,13 @@ function validateEndId(rule: any, value: string, callback: (e?: Error) => any) {
     ) {
         return callback(new Error("结束编号不能小于开始编号"));
     }
+    if (
+        val && addForm.value.detailList.length<index &&
+        addForm.value.detailList[index+1].startId &&
+        val >= addForm.value.detailList[index+1].startId
+    ) {
+        return callback(new Error("结束编号不能大于下一段的开始编号"));
+    }
     // 列表中不能重复校验
     let endIds = addForm.value.detailList.filter((item) => item.endId === val);
     if (endIds.length > 1) {
@@ -553,6 +561,13 @@ function validateStartId(
     ) {
         return callback(new Error("开始编号不能大于结束编号"));
     }
+    if (
+        val && index>0 &&
+        addForm.value.detailList[index-1].endId &&
+        val <= addForm.value.detailList[index-1].endId
+    ) {
+        return callback(new Error("开始编号不能小于上一段的结束编号"));
+    }
     // 列表中不能重复校验
     let startIds = addForm.value.detailList.filter((item) => item.startId === val);
     if (startIds.length > 1) {
@@ -764,6 +779,8 @@ function getSummaries(param) {
         if (summary.value) {
             console.log(data, '-----');
             const successTotal = data.map((item) => Number(item.successTotal));
+            console.log(successTotal.value);
+            console.log(4535);
             let totalNum = sums[1] = successTotal.reduce((prev, curr) => {
                 return prev + curr
             }, 0)

src/views/inventoryControl/putInstorage/index.vue

@@ -309,7 +309,6 @@ function getList() {
     }
   }
   tableData.value = []
-  ///invw/inventory/inventorypagelist
   BaseService.postN('/invw/api/enterApply/page', params).then(
     (res: any) => {
       if (res && res.code === 0) {

src/views/onlineBusinessHall/informationManagement/carInfo/index.vue

@@ -65,7 +65,7 @@
     return $storeinitData.state.dictData["VEHICLE_CONTRACT_TYPE"] || [];
   }); // 车辆签约
   const NATURE_VEHICLE_USE = computed(() => {
-    return $storeinitData.state.dictData["NATURE_VEHICLE_USE"] || [];
+    return $storeinitData.state.dictData["VERHICLE_USE"] || [];
   }); // 车辆签约
 
   //查询参数
@@ -301,18 +301,30 @@
           checkContent: 'integer',
           integerlength: 25,
           required: true,
+          funRuleStarts: true,
+          funRule: (val) => {
+            return dataDesensitization(val)
+          },
         }
       },
       {
         hide: true,
         prop: "ownerTel",
         label: "客户联系方式",
+        funRuleStarts: true,
+        funRule: (val) => {
+          return dataDesensitization(val)
+        },
         form: {
           width: '45%',
           formLabelWidth: formLabelWidth,
           type: 'input',
           phoneVerification: true,
           required: true,
+          funRuleStarts: true,
+          funRule: (val) => {
+            return dataDesensitization(val)
+          },
         }
       },
       {
@@ -434,7 +446,7 @@
       // },
       {
         hide: true,
-        prop: "useCharacter",
+        prop: "useCharacterCode",
         label: "车辆使用性质",
         listData: NATURE_VEHICLE_USE,
         form: {

src/views/onlineBusinessHall/informationManagement/cardInfo/index.vue

@@ -212,14 +212,14 @@ function handleCurrentChange(val: number) {
 
 function handleInfo(value, row) {
   field.value.field.forEach((item: any) => {
-    item.form.hideInfo = false
+    // item.form.hideInfo = false
   })
   field.value.dialogArray = []
 }
 
 function handleOhterInfo(type, row) {
   field.value.field.forEach((item: any) => {
-    item.form.hideInfo = true
+    // item.form.hideInfo = true
   })
   crudRef.value.form = {}
   crudRef.value.dialogInfo = true
@@ -1357,7 +1357,7 @@ const field = ref<any>({
     },
     {
       label: '卡启用时间',
-      prop: 'cardEnabletime',
+      prop: 'cardEnableTime',
       hide: true,
       funRuleStarts: true,
       funRule: (val: any) => {
@@ -1381,7 +1381,7 @@ const field = ref<any>({
     },
     {
       label: '卡状态变更时间',
-      prop: 'cardStatusChangetime',
+      prop: 'cardStatusChangeTime',
       hide: true,
       funRuleStarts: true,
       funRule: (val: any) => {

src/views/onlineBusinessHall/informationManagement/obuInfo/index.vue

@@ -1372,7 +1372,7 @@ const field = ref({
     },
     {
       label: 'obu启用时间',
-      prop: 'obuEnabletime',
+      prop: 'obuEnableTime',
       hide: true,
       funRuleStarts: true,
       funRule: (val: any) => {
@@ -1396,7 +1396,7 @@ const field = ref({
     },
     {
       label: 'obu状态变更时间',
-      prop: 'obuStatusChangetime',
+      prop: 'obuStatusChangeTime',
       hide: true,
       funRuleStarts: true,
       funRule: (val: any) => {

src/views/onlineBusinessHall/informationManagement/userInfo/index.vue

@@ -29,7 +29,7 @@
       </template>
 
       <template #operation="{ scope }">
-        <el-button type="primary" size="small" class="code-btn" @click="showUserInfo(scope.row)">详 情</el-button>
+        <el-button type="success" size="small" class="code-btn" @click="showUserInfo(scope.row)">详情</el-button>
       </template>
 
     </crud-template>
@@ -361,6 +361,7 @@
         data.forEach(item => {
           item.customerIdNumDesensitization = dataDesensitization(item.customerIdNum)
           item.customerTelDesensitization = dataDesensitization(item.customerTel)
+          item.agentIdNumDesensitization = dataDesensitization(item.agentIdNum)
           rowData.value[item.customerId] = {
             isVerification: true,
             count: 60,
@@ -884,7 +885,7 @@
         }
       },
       {
-        prop: "agentIdNum",
+        prop: "agentIdNumDesensitization",
         label: "指定经办人证件号码",
         type: 'text',
         hide: true,

src/views/system/userManage/addorupdate.vue

@@ -9,7 +9,7 @@
             <el-input maxlength="60"v-trim clearable  v-model="dataForm.staffId" type="text" placeholder="请输入员工工号"></el-input>
         </el-form-item> -->
         <el-form-item prop="mobile" label="手机号">
-            <el-input maxlength="60" v-trim clearable v-model="dataForm.mobile" type="text" placeholder="请输入手机号" :disabled="true"></el-input>
+            <el-input maxlength="60" v-trim clearable v-model="dataForm.mobile" type="text" placeholder="请输入手机号" :disabled="disabled"></el-input>
         </el-form-item>
         <el-form-item prop="identityType" label="员工身份标识">
             <el-select clearable v-model="dataForm.identityType" style="width: 100%" placeholder="请选择员工身份标识">
@@ -82,6 +82,13 @@ const initItem = {
     status: 1, // 后端目前没有定义好类型有哪些，新增时默认为1
     releaseTime: ""
 };
+//定义一个父组件传来的参数
+const props = defineProps({
+  disabled: {
+        type: Boolean,
+        default: false
+    },
+})
 const state = reactive({
     dataForm: {
         ...initItem

src/views/system/userManage/index.vue

@@ -70,7 +70,7 @@
       <template #dialog>
         <div v-if="typeOption === 'add' || typeOption === 'edit'">
           <AddOrUpdate :ref="(el) => (addRef = el)" @close-handle="cancel" @refresh-list="btnSearch()"
-            :agencyList="agencyList" />
+            :agencyList="agencyList" :disabled="typeOption !== 'add'"/>
         </div>
         <div v-if="typeOption === 'modifyRole'">
           <ModifyRole :ref="(el) => (modifyRoleRef = el)" @close-handle="cancel" @refresh-list="btnSearch()" />