From 69fc978b741e70735c09d83c3fc0e041dae8001c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 30 Sep 2022 11:51:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=93=81=E7=89=8C=E7=AE=80=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/pinpai/pinpaiguanli/pinpaiAdd.vue   |  27 ++--
 .../views/pinpai/pinpaiguanli/pinpaiInfo.vue  | 120 ++++--------------
 2 files changed, 40 insertions(+), 107 deletions(-)

diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
index e0c78d2b58..9361dd38b3 100644
--- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
@@ -25,6 +25,12 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item prop="brandShortName">
+              <span slot="label">品牌简称：</span>
+              <el-input v-model="temp.brandShortName" maxlength="125" placeholder="" class="addinputw" clearable />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item prop="brandType">
               <span slot="label">品牌类型：</span>
@@ -33,26 +39,27 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item prop="isValidity">
-              <span slot="label">是否有效：</span>
-              <el-select v-model="temp.isValidity" class="addinputw" placeholder="请选择是否有效">
-                <el-option v-for="(item,index) in isValiditys" :key="index" :label="item.dictValue" :value="item.sid" />
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item prop="manufacturerSid">
               <span slot="label">厂商名称：</span>
               <el-select v-model="temp.manufacturerSid" class="addinputw" filterable placeholder="请选择厂商名称">
-                <el-option v-for="item in supplierType" :key="item.sid" :label="item.manufacturerName"
-                  :value="item.sid" />
+                <el-option v-for="item in supplierType" :key="item.sid" :label="item.manufacturerName" :value="item.sid" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item prop="isValidity">
+              <span slot="label">是否有效：</span>
+              <el-select v-model="temp.isValidity" class="addinputw" placeholder="请选择是否有效">
+                <el-option v-for="(item,index) in isValiditys" :key="index" :label="item.dictValue" :value="item.sid" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <el-form-item prop="useOrg">
               <span slot="label">使用组织：</span>
               <el-select v-model="useOrgValue" multiple placeholder="请选择" filterable clearable class="addinputw"
diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiInfo.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiInfo.vue
index 297a7ce846..931f7f444a 100644
--- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiInfo.vue
+++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiInfo.vue
@@ -3,30 +3,33 @@
     <div class="tab-header webtop">
       <div>品牌详情</div>
       <div>
-        <!-- <el-button type="primary" size="small" @click="handleCreate()">保存</el-button> -->
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
     <div class="listconadd">
-      <el-form ref="dataForm" :model="templook" label-position="right" label-width="190px" class="forminfo" :rules="rules">
+      <el-form ref="dataForm" :model="templook" class="forminfo" :rules="rules">
         <div class="title">品牌信息</div>
         <el-row>
-          <el-col :span="4" class="trightb">品牌编码：</el-col>
-          <el-col :span="8" class="tleft"> {{ templook.brandCode }} </el-col>
-          <el-col :span="4" class="trightb">品牌名称：</el-col>
-          <el-col :span="8" class="tleft"> {{ templook.brandName }} </el-col>
+          <el-col :span="4" class="trightb">品牌编码</el-col>
+          <el-col :span="8" class="tleft"> {{ templook.brandCode }}</el-col>
+          <el-col :span="4" class="trightb">品牌名称</el-col>
+          <el-col :span="8" class="tleft"> {{ templook.brandName }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">品牌类型：</el-col>
-          <el-col :span="8" class="tleft"> {{ templook.brandTypeValue }} </el-col>
-          <el-col :span="4" class="trightb">是否有效：</el-col>
-          <el-col :span="8" class="tleft"> {{ templook.isValidityValue }} </el-col>
+          <el-col :span="4" class="trightb">品牌简称</el-col>
+          <el-col :span="8" class="tleft"> {{ templook.brandShortName }}</el-col>
+          <el-col :span="4" class="trightb">品牌类型</el-col>
+          <el-col :span="8" class="tleft"> {{ templook.brandTypeValue }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">厂商名称：</el-col>
-          <el-col :span="8" class="tleft"> {{ templook.manufacturerName }} </el-col>
-          <el-col :span="4" class="trightb">使用组织：</el-col>
-          <el-col :span="8" class="tleft"> {{ templook.useOrgName }} </el-col>
+          <el-col :span="4" class="trightb">厂商名称</el-col>
+          <el-col :span="8" class="tleft"> {{ templook.manufacturerName }}</el-col>
+          <el-col :span="4" class="trightb">是否有效</el-col>
+          <el-col :span="8" class="tleft"> {{ templook.isValidityValue }}</el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="trightb">使用组织</el-col>
+          <el-col :span="20" class="tleft"> {{ templook.useOrgName }}</el-col>
         </el-row>
       </el-form>
     </div>
@@ -34,121 +37,44 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import { details } from '@/api/jichuxinxi/brandManagement'
-// import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
-// import { findButtonByUserId } from '@/api/sys/permission'
+
 export default {
   name: 'PinpaiAdd',
-  // components: {  },
   data() {
     return {
       // --按钮菜单-------
-      menuState: {
-        add: false, // 添加
-        edit: false, // 编辑
-        delete: false, // 删除
-        view: false, // 查看
-        audit: false, // 审核
-        input: false, // 导入
-        output: false, // 导出
-        upload: false, // 同步
-        release: false, // 下发
-      },
       FormLoading: false,
       listLoading: false,
-      temp: {}, // 添加和修改
       templook: {}, // 查看实体
-      textMap: {
-        update: '修改',
-        create: '创建',
-      },
-      dialogFormVisible: false, // 添加修改对话框状态
-      dialogFormShowVisible: false, // 查看对话框默认关闭状态
-      dialogStatus: '', // 对话框状态
-      fenzuOptions: [],
-      rules: {
-        title: [{ required: true, message: '请填写', trigger: 'blur' }],
-        qc: [{ required: true, message: '请填写全称', trigger: 'blur' }],
-      },
-      tempDate: {},
-      // ------------------------------------
+      rules: {}
     }
   },
-  computed: {
-    ...mapGetters([
-      'id',
-      'roles',
-      'rolesIds',
-      'departmentId',
-      'departmentCode',
-    ]),
-  },
-  created() {
-    // this.tempDate.sid = this.$route.query.sid
-    // console.log(33333333333, this.tempDate.sid)
-    // // 初始化变量
-    // this.init()
-    // // 加载列表
-    // this.handleCheck()
-  },
   methods: {
-    init() {
-      // 根据当前用户. 加载当前页面的按钮权限
-      // findButtonByUserId(this.$route.path).then(response => {
-      //   if (
-      //     response.code === 20000 &&
-      //   response.data &&
-      //   response.data.length > 0
-      //   ) {
-      //     this.menuState = ConvertMenuState(response.data) // 处理各按钮显示状态
-      //   }
-      // })
-    },
-    // 序号
-    // indexMethod(index) {
-    //   var pagestart = (this.listQuery.pageNumber - 1) * this.listQuery.pageSize
-    //   var pageindex = index + 1 + pagestart
-    //   return pageindex
-    // },
-
     // ----------------------------------方法--------------------
     // 返回
     handleReturn() {
-      this.temp = {}
       this.$emit('doback')
     },
-
-    // 添加前数据初始化
-    resetTemp() {
-      this.temp = {
-        jc: '', //			false	string
-        organizationId: '', //			false	string
-        qc: '', //			false	string
-        remark: '', //			false
-        string: '', //
-        state: '', //	状态
-      }
-    },
     // 打开查看
     showInfo(sid) {
       this.FormLoading = true
       details(sid).then((response) => {
         console.log('查询', response)
         this.FormLoading = false
-        if (response.code === '200') {
+        if (response.success) {
           this.templook = response.data
           console.log('查询1', this.templook)
         } else {
           this.$notify({
             title: '失败',
             message: '查询失败',
-            type: 'error',
+            type: 'error'
           })
         }
       })
-    },
-  },
+    }
+  }
 }
 </script>
 <style scoped>