Merge branch 'master' of http://82.156.35.112:3000/chensiyi/zonghe_web

src/views/interfaceManage/interfaceConfig/index.vue

           </el-form-item>
           <el-form-item label="接口标识:" prop="interfaceCode">
             <div style="width: 100%">
-              <el-input maxlength="60" v-trim clearable v-model="addForm.interfaceCode" placeholder="请输入接口标识"
+              <el-input maxlength="60" v-trim clearable :disabled="interfaceCodeDisabled" v-model="addForm.interfaceCode" placeholder="请输入接口标识"
                 v-if="typeOption !== 'view'" />
               <span v-else>{{ addForm.interfaceCode }}</span>
             </div>
   const addFieldRef = ref();
   const addFieldVisible = ref(false);
   const dialogVisible = ref(false);
+  const interfaceCodeDisabled = ref(false)
   const enumList = reactive({
     businessList: [] as IObject[],
   })
 
   //表单编辑按钮
   function handleEdit(idx: any, row: any) {
+    interfaceCodeDisabled.value = true
     formLoding.value = true;
     const data = toRaw(row);
     getRow(data.id);
   }
   function handleAdd() {
     getBusinessList();
+    interfaceCodeDisabled.value = false
   }
   onMounted(() => {
     // getType();

src/views/onlineBusinessHall/orderManagement/index.vue

       getList()
     }">
       <template #search>
-        <el-input maxlength="60" v-trim clearable v-model="searchForm.orderId" style="width: 200px"
+        <el-input maxlength="60" v-trim clearable v-model="searchForm.orderNo" style="width: 200px"
           placeholder="请输入单号" />
         <el-input maxlength="60" v-trim clearable v-model="searchForm.customerIdnum" style="width: 200px"
           placeholder="请输入证件号" />
         <el-select clearable v-model="searchForm.artificialStatus" style="width: 200px" placeholder="请选择审核类型">
           <el-option v-for="item in artificialStatusList" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-        <el-select clearable v-model="searchForm.type" style="width: 200px" placeholder="请选择车辆类型">
+        <el-select clearable v-model="searchForm.vanType" style="width: 200px" placeholder="请选择车辆类型">
           <el-option v-for="item in vehicleTypes" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <el-select clearable v-model="searchForm.promotionModes" style="width: 200px" placeholder="请选择办理方式">
           placeholder="请选择设备类型">
           <el-option v-for="item in CSMSN_DEVICE_TYPE" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-        <el-select clearable v-model="searchForm.orderTypes" multiple style="width: 200px" placeholder="请选择订单类型">
+        <!-- <el-select clearable v-model="searchForm.orderTypes" multiple style="width: 200px" placeholder="请选择订单类型">
           <el-option v-for="item in newOrderTypeList" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
+        </el-select> -->
         <!-- <div class="date-label">创建时间:</div> -->
         <el-date-picker unlink-panels v-model="searchForm.time" type="datetimerange" range-separator="到"
           start-placeholder="订单创建开始日期" end-placeholder="订单创建结束日期" format="YYYY-MM-DD HH:mm:ss"
           </el-select>
         </el-form-item>
         <el-form-item label="物流单号" prop="trackingNumber">
-          <el-input v-trim clearable maxlength="60" :disabled="trackingNumberDisabled" v-model="trackingNumber"
+          <el-input v-trim clearable maxlength="60" :disabled="trackingNumberDisabled" v-model="sizeForm.trackingNumber"
             placeholder="物流单号"></el-input>
         </el-form-item>
       </el-form>
 
   // 物流单号
   const trackingNumberDisabled = ref(false)
-  const trackingNumber = ref()
   function courierCompanyChange(value) {
     if (value == '99') {
-      trackingNumber.value = '000000'
+      sizeForm.value.trackingNumber = '000000'
       trackingNumberDisabled.value = true
     } else {
-      trackingNumber.value = ''
+      sizeForm.value.trackingNumber = ''
       trackingNumberDisabled.value = false
     }
-    sizeForm.value.trackingNumber = trackingNumber.value
   }
 
   let tageList = [
   //查询参数
   const searchForm = ref({
     artificialStatus: '',
-    orderId: '',
+    orderNo: '',
     productName: '',
     vehiclePlate: '',
-    type: '',
+    vanType: '',
     orderTypes: '',
     orderStep: '',
     time: '',
   function refreshLeft() {
     searchForm.value = {
       artificialStatus: '',
-      orderId: '',
+      orderNo: '',
       productName: '',
       vehiclePlate: '',
-      type: '',
+      vanType: '',
       orderTypes: '',
       orderStep: '',
       time: '',
   function submitForm(formEl) {
     if (timer1) return
     timer1 = setTimeout(() => {
-      sizeForm.value.trackingNumber = trackingNumber.value
       formEl.validate((valid: any, fields: any) => {
         if (valid) {
           delete sizeForm.value.type
           sizeForm.value.courierCompany = ''
           sizeForm.value.trackingNumber = ''
           sizeForm.value.orderId = data.orderNo
-          trackingNumber.value = ''
           deliverGoods.value = true
         } else {
           ElMessage.error(res.message)

src/views/onlineBusinessHall/orderManagement/orderReview/index.vue

       getList()
     }">
       <template #search>
-        <el-input maxlength="60" v-trim clearable v-model="searchForm.orderId" style="width: 200px"
+        <el-input maxlength="60" v-trim clearable v-model="searchForm.orderNo" style="width: 200px"
           placeholder="请输入单号" />
         <el-input maxlength="60" v-trim clearable v-model="searchForm.customerIdnum" style="width: 200px"
           placeholder="请输入证件号" />
         <!-- <el-select clearable v-model="searchForm.artificialStatus" style="width: 200px" placeholder="请选择审核类型">
           <el-option v-for="item in artificialStatusList" :key="item.value" :label="item.label" :value="item.value" />
         </el-select> -->
-        <el-select clearable v-model="searchForm.type" style="width: 200px" placeholder="请选择车辆类型">
+        <el-select clearable v-model="searchForm.vanType" style="width: 200px" placeholder="请选择车辆类型">
           <el-option v-for="item in vehicleTypes" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <el-select clearable v-model="searchForm.promotionModes" style="width: 200px" placeholder="请选择办理方式">
           <el-option v-for="item in PATTERN_TYPE" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-        <el-select clearable v-model="searchForm.orderType" style="width: 200px" placeholder="请选择订单类型">
+        <!-- <el-select clearable v-model="searchForm.orderType" style="width: 200px" placeholder="请选择订单类型">
           <el-option v-for="item in ORDER_TYPE" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
+        </el-select> -->
         <!-- <div class="date-label">创建时间:</div> -->
         <el-date-picker unlink-panels v-model="searchForm.time" type="datetimerange" range-separator="到"
           start-placeholder="订单创建开始日期" end-placeholder="订单创建结束日期" format="YYYY-MM-DD HH:mm:ss"
   const itemStart = ref(true)
   const searchForm = ref({
     artificialStatus: '',
-    orderId: '',
+    orderNo: '',
     productName: '',
     vehiclePlate: '',
-    type: '',
+    vanType: '',
     orderType: '',
     orderStep: '',
     time: '',
     field.value.paging.currentPage = 1
     searchForm.value = {
       artificialStatus: '',
-      orderId: '',
+      orderNo: '',
       productName: '',
       vehiclePlate: '',
-      type: '',
+      vanType: '',
       orderType: '',
       orderStep: '',
       time: '',

src/views/system/menuManage/index.vue

       </template>
       <!-- 状态tag -->
       <template #statusTage="{ scope }">
-        <el-tag :type="scope.row.status === 'DISABLE' ? 'danger' : ''">
+        <el-tag :type="scope.row.status === 'DISABLE' ? 'danger' : 'primary'">
           {{ getDictLabel(statusList, scope.row.status) }}
         </el-tag>
       </template>

src/views/system/roleManage/index.vue

         <!-- 状态tag -->
         <!-- @vue-ignore -->
         <template #statusTage="{ scope }">
-          <el-tag :type="scope.row.status === 'DISABLE' ? 'danger' : ''">
+          <el-tag :type="scope.row.status === 'DISABLE' ? 'danger' : 'primary'">
             {{ getDictLabel(statusList, scope.row.status) }}
           </el-tag>
         </template>