戴艳蓉 3 years ago
parent
commit
08e1796356

+ 7 - 4
src/apis/service/sellOut/zixunOrder/index.js

@@ -2,6 +2,12 @@
 import http from "@/apis/axios";
 const api = "admin/";
 export default {
+  // 详情
+  detail: (data, params) => http(api + "consultzxinfo", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "zxedit", data, "post", params),
+
+
   // 添加
   add: (data, params) => http(api + "consultcreate", data, "post", params),
   // 分页查询项目列表
@@ -14,10 +20,7 @@ export default {
   pdetail: (data, params) => http(api + "projectinfo", data, "post", params),
   // 分页查询
   feedList: (data, params) => http(api + "consultbidlist", data, "post", params),
-  // 详情
-  detail: (data, params) => http(api + "consultzxinfo", data, "post", params),
-  // 更新
-  update: (data, params) => http(api + "update", data, "post", params),
+
   // 修改状态
   status: (data, params) => http(api + "afterstatus", data, "post", params),
   // 异常原因接口

+ 2 - 2
src/views/sellOut/zixunOrder/columns.js

@@ -76,7 +76,7 @@ const rules = {
   brand_id: [
     {
       type: "array",
-      required: false,
+      required: true,
       message: "请选择品牌",
       trigger: "change",
     },
@@ -286,7 +286,7 @@ const edutRules = {
   brand_id: [
     {
       type: "array",
-      required: false,
+      required: true,
       message: "请选择品牌",
       trigger: "change",
     },

+ 2 - 1
src/views/sellOut/zixunOrder/components/addEditGoodModal.vue

@@ -355,7 +355,8 @@
                         disabled
                         placeholder="当前金价"
                         maxlength="500"
-                      />
+                      >
+                       <template slot="append">元</template></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8" class="fr tr">

+ 37 - 26
src/views/sellOut/zixunOrder/components/baseFormAddEdit.vue

@@ -26,14 +26,14 @@
             label-width="80px"
             class="demo-ruleForm"
           >
-            <el-form-item label="规格类型" prop="spec_id">
+            <el-form-item label="规格类型" prop="specid">
               <search-spec
-                :value="ruleForm.spec_id"
+                :value="ruleForm.specid"
                 :disabled="false"
                 :size="'mini'"
                 :isDetail="false"
                 :placeholder="'规格类型'"
-                @searchChange="spec_idsearchChange"
+                @searchChange="specidsearchChange"
               />
             </el-form-item>
             <el-form-item label="规格值" prop="spec_value_id">
@@ -105,7 +105,7 @@ export default {
       rulesThis: this.rules,
 
       rules: {
-        spec_id: [
+        specid: [
           {
             required: true,
             message: "规格类型不能为空",
@@ -146,33 +146,43 @@ export default {
     },
     async resetForm() {
       // 重置
-      await this.$nextTick(() => {
+      await this.$nextTick(async () => {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          this.resetFormData();
+          if (this.index + "" !== "-1") {
+            this.specVlist = [];
+            const { specid, spec_name, spec_value_id, spec_value_name } =
+              this.sitem;
+            this.ruleForm = {
+              index: this.index,
+              specid: specid || "",
+              spec_name: spec_name || "",
+              spec_value_id: spec_value_id || "",
+              spec_value_name: spec_value_name || "",
+            };
+            await this.getlist();
+            console.log(this.ruleForm);
+          }
         }
       });
     },
     resetFormData() {
       this.specVlist = [];
-      const { id, spec_id, spec_value, spec_value_id, spec_value_value } =
-        this.sitem;
       this.ruleForm = {
-        index: this.index,
-        id: id || "",
-        spec_id: spec_id || "",
-        spec_value: spec_value || "",
-        spec_value_id: spec_value_id || "",
-        spec_value_value: spec_value_value || "",
+        index: "-1",
+        specid: "",
+        spec_name: "",
+        spec_value_id: "",
+        spec_value_name: "",
       };
     },
     async add_spec() {
-      const { spec_id } = this.ruleForm;
-      if (spec_id) {
+      const { specid } = this.ruleForm;
+      if (specid) {
         if (this.sinput) {
           const { code, data, message } = await asyncRequest.valueadd({
-            spec_id: spec_id,
+            spec_id: specid,
             spec_value: this.sinput,
           });
           if (code === 0) {
@@ -189,29 +199,29 @@ export default {
         this.$message.warning("请选择规格类型!");
       }
     },
-    async spec_idsearchChange(e) {
+    async specidsearchChange(e) {
       const { id, spec_name } = e;
-      this.ruleForm.spec_id = id || "";
-      this.ruleForm.spec_value = spec_name || "";
-      this.$refs.ruleForm.validateField("spec_id");
+      this.ruleForm.specid = id || "";
+      this.ruleForm.spec_name = spec_name || "";
+      this.$refs.ruleForm.validateField("specid");
       await this.getlist();
     },
     spec_value_id_change(e) {
       if (e) {
         const { id, spec_value } = this.specVlist.find((i) => i.id === e);
         this.ruleForm.spec_value_id = id || "";
-        this.ruleForm.spec_value_value = spec_value || "";
+        this.ruleForm.spec_value_name = spec_value || "";
       } else {
         this.ruleForm.spec_value_id = "";
-        this.ruleForm.spec_value_value = "";
+        this.ruleForm.spec_value_name = "";
       }
       this.$refs.ruleForm.validateField("spec_value_id");
     },
     async getlist() {
-      const { spec_id } = this.ruleForm;
-      if (spec_id) {
+      const { specid } = this.ruleForm;
+      if (specid) {
         const { code, data, message } = await asyncRequest.valueall({
-          spec_id: spec_id,
+          spec_id: specid,
         });
         if (code === 0) {
           this.specVlist = data;
@@ -229,6 +239,7 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.showModelThis = false;
+          console.log(this.ruleForm);
           this.$emit("refresh", this.ruleForm);
         } else {
           console.log("error submit!!");

File diff suppressed because it is too large
+ 438 - 410
src/views/sellOut/zixunOrder/components/editForm.vue


+ 25 - 9
src/views/sellOut/zixunOrder/detail.vue

@@ -18,9 +18,9 @@
         <el-tab-pane label="咨询单详情" name="1" v-if="queryType !== 'add'">
           <el-collapse v-model="projectNames" style="margin: -18px 0 0 0">
             <el-collapse-item title="咨询单详情" name="0">
-             <show-data-table 
+              <show-data-table
                 :newTime="newTime"
-                v-if="newTime !== ''"
+                v-if="newTime !== '' && queryType === 'view'"
                 :sitem="sitem"
                 :columns="ShowDataTableColumns"
               >
@@ -39,7 +39,7 @@
                   ></el-tag> -->
                 </template>
               </show-data-table>
-                <edit-form
+              <edit-form
                 v-if="newTime !== ''"
                 :newTime="newTime"
                 :id="queryId"
@@ -48,7 +48,11 @@
                 @refresh="refresh"
               />
             </el-collapse-item>
-            <el-collapse-item title="咨询单反馈详情" name="0">
+            <el-collapse-item
+              title="咨询单反馈详情"
+              name="0"
+              v-if="queryType == 'view'"
+            >
               <feedback-list
                 v-if="newTime !== ''"
                 :newTime="newTime"
@@ -59,7 +63,11 @@
             <el-collapse-item
               title="采购部定价"
               name="2"
-              v-if="status == '1' && powers.some((item) => item == '057')"
+              v-if="
+                status == '1' &&
+                powers.some((item) => item == '057') &&
+                queryType == 'view'
+              "
             >
               444
             </el-collapse-item>
@@ -67,7 +75,11 @@
             <el-collapse-item
               title="财务定价"
               name="3"
-              v-if="status == '2' && powers.some((item) => item == '058')"
+              v-if="
+                status == '2' &&
+                powers.some((item) => item == '058') &&
+                queryType == 'view'
+              "
             >
               555
             </el-collapse-item>
@@ -75,13 +87,17 @@
             <el-collapse-item
               title="财务审核定价"
               name="4"
-              v-if="status == '3' && powers.some((item) => item == '059')"
+              v-if="
+                status == '3' &&
+                powers.some((item) => item == '059') &&
+                queryType == 'view'
+              "
             >
               666
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
+        <el-tab-pane label="审批记录" name="2" v-if="queryType == 'view'">
           111
         </el-tab-pane>
       </el-tabs>
@@ -134,7 +150,7 @@ export default {
     return {
       statusList: [],
       size: "small",
-      ShowDataTableColumns:ShowDataTableColumns,
+      ShowDataTableColumns: ShowDataTableColumns,
       projectTabs: "1",
       projectNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
       newTime: "",

Some files were not shown because too many files changed in this diff