bug修改

src/views/inventoryControl/newInventory/allocationManagement/addOrUpdate.vue

@@ -393,8 +393,8 @@ const rules = reactive({
   // brand: [{ required: true, message: "请选择申请单类型", trigger: "blur" }],
   receiveStoreCode: [{required: true, message: "请选择收货仓库", trigger: "blur"}],
   sendStoreCode: [{required: true, message: "请选择发货仓库", trigger: "blur"}],
-  // cardType: [{ required: true, message: "请选择卡类型", trigger: "blur" }],
-  // obuType: [{ required: true, message: "请选择签类型", trigger: "blur" }],
+  cardType: [{ required: true, message: "请选择卡类型", trigger: "blur" }],
+  obuType: [{ required: true, message: "请选择签类型", trigger: "blur" }],
 })
 const props2 = {
   value: "code",

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

@@ -50,7 +50,7 @@ const widthBase = '120px';
 const crudRef = ref()
 const value1 = ref()
 let tableData: any = ref([])
-const itemStartValue = ref("1")
+const itemStartValue = ref(1)
 //查询参数
 const searchForm = ref({ agencyId: '' })
 const agencyIdList = ref([])
@@ -207,28 +207,30 @@ function getList() {
 
 const Adds = () => {
   itemStartValue.value = 1
+  console.log("type111====>", itemStartValue.value)
 }
 //表单编辑按钮
 function itemEdit(idx: any, row: any) {
   itemStartValue.value = 2
+  console.log("type====>", itemStartValue.value)
 }
 
 // 添加
 const submitAdd = (data: any) => {
-  request(data, itemStartValue.value)
+  console.log("type====>", typeOption.value)
+  // request(data, itemStartValue.value)
 }
 
 const request = (data: any, type: any) => {
-  data.optType = type //操作类型 1新增 2修改 
-  BaseService.postN(itemStartValue.value == 1 ? '/invw/api/warehouse/add' : '/invw/api/warehouse/edit', data).then((res: any) => {
+  //操作类型 1新增 2修改
+  console.log("type====>",type,"---->", itemStartValue.value)
+  BaseService.postN(type == 1 ? '/invw/api/warehouse/add' : '/invw/api/warehouse/edit', data).then((res: any) => {
     if (res && res.code === 0) {
       getList()
       getAgenCy()
       getUpperWarehouseIdList()
       crudRef.value.reset();
       crudRef.value.dialogFormVisible = false;
-    } else {
-      ElMessage.error(res.message)
     }
   })
 }

src/views/system/agency/index.vue

@@ -327,19 +327,10 @@ const field = ref({
         {
             prop: "issuerId",
             label: "发行方编号",
+          hide: true,
             width: "80px"
         },
-        {
-            prop: "name",
-            label: "渠道名称",
-            width: "200px",
-            form: {
-                width: '45%',
-                formLabelWidth: formLabelWidth,
-                type: 'input',
-                required: true,
-            }
-        },
+
         {
             prop: "agencyId",
             label: "渠道编号",
@@ -352,9 +343,20 @@ const field = ref({
                 disabled: false
             }
         },
+      {
+        prop: "name",
+        label: "渠道名称",
+        width: "200px",
+        form: {
+          width: '45%',
+          formLabelWidth: formLabelWidth,
+          type: 'input',
+          required: true,
+        }
+      },
         {
             prop: "mapAgencyId",
-            label: "中心渠道编号",
+            label: "中心渠道",
             width: "120px",
             listData: getCenterAgencyIdList,
             form: {
@@ -381,6 +383,7 @@ const field = ref({
         {
             prop: "contact",
             label: "联系人姓名",
+          width: '100',
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -389,6 +392,7 @@ const field = ref({
         }, {
             prop: "tel",
             label: "联系电话",
+        width: '100',
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -425,6 +429,7 @@ const field = ref({
         {
             prop: 'address',
             label: '地址',
+          width: '100',
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -474,6 +479,7 @@ const field = ref({
         {
             prop: 'email',
             label: 'email',
+          width: '100',
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -486,18 +492,6 @@ const field = ref({
             slotSet: true,
             slotSetName: "status",
         },
-        {
-            prop: "info",
-            label: "备注",
-            span: 3,
-            form: {
-                width: '95%',
-                formLabelWidth: formLabelWidth,
-                type: 'input',
-                itemType: 'textarea',
-                rows: 5
-            }
-        },
         {
             hide: true,
             prop: "agencyModels",
@@ -521,7 +515,19 @@ const field = ref({
                 }
                 return val
             },
+        },
+      {
+        prop: "info",
+        label: "备注",
+        span: 3,
+        form: {
+          width: '95%',
+          formLabelWidth: formLabelWidth,
+          type: 'input',
+          itemType: 'textarea',
+          rows: 5
         }
+      },
     ]
 });
 // 搜索按钮

src/views/system/branch/index.vue

@@ -16,7 +16,7 @@
           添加一级网点
         </el-button> -->
         <el-button type="success" @click="getItmeLiet()">
-          中心网点管理
+          报备部中心网点管理
         </el-button>
       </template>
       <template #operation="{ scope }">
@@ -175,7 +175,7 @@
     </crud-template>
 
 
-    <el-dialog title="中心网点管理" v-model="vShowDoalog">
+    <el-dialog title="报备部中心网点管理" v-model="vShowDoalog">
       <crud-template ref="crudRefTwo" :home-data="zxqdFind" @submit="itemAdd" @handleEdit="itemEdit" @add="Adds"
         :searchForm="searchForm2" @btnSearch="btnSearch2" @CurrentChange="handleCurrentChangeTwo" @handleDelete="itemDelete"
         :tableData="tableItemData" @refreshLeft="refreshLeft2">