报价单管理修改

config/dev.env.js

@@ -13,8 +13,8 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
-  // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
-  BASE_URL: '"http:///192.168.0.103:8080/"',//
+  BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
+  // BASE_URL: '"http:///192.168.0.103:8080/"',//
 })
 
 

src/http/moudules/menu.js

@@ -114,3 +114,10 @@ export const quotationBatch= (data) => {
         data
     })
 }
+export const findTree= (data) => {
+    return axios({
+        url: '/sys/quotation/findTree',
+        method: 'get',
+        data
+    })
+}

src/views/Sys/QuotationAuthorization.vue

@@ -53,10 +53,15 @@
                     </el-table-column>
                     <el-table-column prop="address" label="机构地址" align="center">
                     </el-table-column>
+                    <el-table-column prop="themeName" label="报价单名称" align="center">
+                        <template slot-scope="scope">
+                           <span :style="'color:' +scope.row.themeColour "> {{ scope.row.themeName }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" fixed="right" align="center" width="150">
                         <template slot-scope="scope">
-                            <KtButton v-if="scope.row.deptType=='D'" :size="'medium'" :type="'text'" :label="'编辑'"
-                                @click.native.stop="handleEdit(scope.row)" @findPage="findSubDeptPage"></KtButton>
+                            <KtButton v-if="scope.row.deptType=='D' && scope.row.mark =='1'" :size="'medium'" :type="'text'" :label="'编辑'"
+                                @click.native.stop="handleEdit(scope.row)"></KtButton>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -67,9 +72,9 @@
             选择报价单 : <el-select v-model="themeId" placeholder="请选择" size="small">
                 <el-option
                 v-for="item in themeIdOptions"
-                :key="item.id"
+                :key="item.themeCode"
                 :label="item.quotationAbbr"
-                :value="item.id">
+                :value="item.themeCode">
                 </el-option>
             </el-select>
             <span slot="footer" class="dialog-footer">
@@ -114,7 +119,6 @@ export default {
     },
     mounted() {
         this.filters.id = "9";
-        this.findSubDeptPage(); //初始化数据
     },
     data() {
         return {
@@ -162,7 +166,6 @@ export default {
             this.currentTreeNode = row;
             // this.currentTreeNode = treeNode;
             this.filters.id = this.currentTreeNode.id;
-            this.findSubDeptPage();
         },
         //遍历表格数据
         forTableData(arr, isExpand) {
@@ -202,15 +205,15 @@ export default {
         findTreeData() {
             // 获取机构树的数据
             this.loading = true;
-            this.$api.dept.findDeptTree(this.peopledeptid, "").then((res) => {
+            this.$api.menu.findTree(this.peopledeptid, "").then((res) => {
                 this.ztreeNodes = res.data;
                 this.loading = false;
             });
         },
         managementSourceQuery() {
             this.loading = true;
-            this.$api.dept
-                .findDeptTree(this.peopledeptid, this.managementSource)
+            this.$api.menu
+                .findTree(this.peopledeptid, this.managementSource)
                 .then((res) => {
                     this.ztreeNodes = res.data;
                     this.loading = false;
@@ -222,27 +225,6 @@ export default {
             ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
             this.currentTreeNode = ztreeObj.getNodes()[0];
         },
-        // 右边表格Start
-        findSubDeptPage: function (data) {
-            // 获取分页数据
-            if (!!data) {
-                this.pageRequest = data.pageRequest;
-            }
-            this.pageRequest.columnFilters = {
-                id: {
-                    name: "id",
-                    value: this.filters.id,
-                },
-            };
-            this.$api.dept
-                .findSubDeptPage(this.pageRequest)
-                .then((res) => {
-                    this.pageResult = res.data;
-                })
-                .then(data != null ? data.callback : "");
-        },
-
-      
         //-- formatter begin--
         comlevelFormatter(row, column) {
             let comlevel = row.comlevel;
@@ -307,7 +289,7 @@ export default {
                 .then((res) => {
                     if(res.code==200){
                         this.deptDialogVisible=false
-                        this.findSubDeptPage()
+                        this.findTreeData()
                         this.$message({ message: res.msg, type: "success" });
                     }
                     else{

src/views/Sys/QuotationManagement.vue

@@ -42,7 +42,7 @@
       width="840px"
       :before-close="handleClose"
     >
-      <el-form :model="form" ref="form" label-width="120px">
+      <el-form :model="form" :rules="rules" ref="form" label-width="120px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="二维码图片" prop="qrCode" style="width: 100%">
@@ -71,7 +71,19 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+        <el-form-item label="颜色" prop="themeColour">
+          <el-color-picker
+            v-model="form.themeColour "
+          ></el-color-picker>
+        </el-form-item>
+        <el-form-item label="code" prop="themeCode">
+          <el-input
+          :size="overSize"
+          style="width: 200px"
+          placeholder="请输入报价单code"
+            v-model="form.themeCode"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="状态" prop="state">
           <el-select v-model="form.state" placeholder="请选择是否开启" :size="overSize">
             <el-option label="开启" :value="1"></el-option>
@@ -134,6 +146,20 @@ export default {
           pageNum: 1,
           pageSize: 10,
         },
+        rules: {
+          themeColour: [
+            { required: true, message: '请输入颜色', trigger: 'blur' },
+          ],
+          themeCode: [
+            { required: true, message: '请输入code', trigger: 'blur' },
+          ],
+          quotationAbbr: [
+            { required: true, message: '请输入报价单简称', trigger: 'blur' },
+          ],
+          state: [
+            { required: true, message: '请选择状态', trigger: 'change' }
+          ],
+        }
       // 右侧列表查询数据End
     };
   },