戴艳蓉 пре 3 година
родитељ
комит
d943414d05

+ 11 - 0
src/views/goodStore/active/components/baseForm.vue

@@ -290,6 +290,17 @@ export default {
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "activeDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
   },
   data() {
     return {

+ 3 - 3
src/views/goodStore/active/detail.vue

@@ -6,7 +6,7 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
       <el-tabs v-model="activeTabs">
-        <el-tab-pane label="新建商品" name="0" v-if="queryType === 'add'">
+        <el-tab-pane label="新建活动" name="0" v-if="queryType === 'add'">
           <base-form
             v-if="newTime !== ''"
             :type="queryType"
@@ -16,9 +16,9 @@
             @refresh="refresh"
           />
         </el-tab-pane>
-        <el-tab-pane label="商品详情" name="1" v-if="queryType !== 'add'">
+        <el-tab-pane label="活动详情" name="1" v-if="queryType !== 'add'">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="商品详情" name="0">
+            <el-collapse-item title="活动详情" name="0">
               <base-form
                 v-if="newTime !== ''"
                 :type="queryType"

+ 0 - 89
src/views/sheetOrder/zixunOrder/components/addEdit.vue

@@ -1,89 +0,0 @@
-<template>
-  <el-dialog
-    title="新建售后申请"
-    :center="true"
-    align="left"
-    top="22vh"
-    width="1000px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    @close="showModelThis = false"
-  >
-    <!-- {{ sitem }} -->
-    <el-card style="margin-top: -20px" v-loading="loading">
-      <add-edit-form
-        v-if="showModel"
-        :id="id"
-        :sitem="sitem"
-        :show-model="showModel"
-        :is-detail="isDetail"
-        @closeModel="handClick"
-        @refresh="refresh"
-      />
-    </el-card>
-  </el-dialog>
-</template>
-<script>
-import addEditForm from "./addEditForm.vue";
-export default {
-  name: "handover",
-  props: ["showModel", "id", "isDetail", "sitem"],
-  components: {
-    addEditForm,
-  },
-  data() {
-    return {
-      sitem: null,
-      title: "",
-      showModelThis: this.showModel,
-    };
-  },
-  watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-      if (val) {
-        this.initForm();
-      }
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
-    },
-  },
-  methods: {
-    
-    async initForm() {
-      this.loading = true;
-      console.log(this.id);
-
-      if (this.id === "add") {
-        this.title = "新建售后申请";
-        this.rulesThis = this.rules;
-      } else {
-        if (this.isDetail) {
-          this.rulesThis = {};
-        } else {
-          this.rulesThis = this.rules;
-        }
-      }
-      this.loading = false;
-    },
-    handClick(e) {
-      console.log(e);
-      this.showModelThis = e;
-    },
-    refresh(e) {
-      console.log(e);
-      this.showModelThis = e;
-      this.$emit("refresh", true);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

+ 149 - 114
src/views/sheetOrder/zixunOrder/components/addEditForm.vue

@@ -4,110 +4,110 @@
     :loading="loading"
     :model="ruleForm"
     status-icon
+    :size="'mini'"
     :rules="rulesThis"
-    label-width="100px"
+    label-width="110px"
     style="width: 100%"
     class="demo-ruleForm"
   >
     <el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="异常数量" prop="anomalous_numbers">
-            <el-input
-              :disabled="id !== 'add'"
-              v-model="ruleForm.anomalous_numbers"
-              placeholder="请输入异常数量"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="异常原因" prop="anomalous_reason">
-            <el-select
-              style="width: 100%"
-              :disabled="id !== 'add'"
-              v-model="ruleForm.anomalous_reason"
-              placeholder="请选择异常原因"
-            >
-              <el-option
-                v-for="item in reason_options"
-                :key="item.id"
-                :label="item.result"
-                :value="item.result_code"
-                :disabled="item.status == 0"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="期望意愿" prop="expect_wish">
-            <el-select
-              style="width: 100%"
-              :disabled="id !== 'add'"
-              v-model="ruleForm.expect_wish"
-              placeholder="请选择期望意愿"
+      <el-col :span="12">
+        <el-form-item label="销售方" prop="anomalous_numbers">
+          <search-work-company
+            :value="ruleForm.companyNo"
+            :placeholder="'销售方公司'"
+            :disabled="type === 'view'"
+            :size="'mini'"
+            :isDetail="type === 'view'"
+            @searchChange="company_idsearchChange"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="购买方公司" prop="anomalous_reason">
+          <search-customer
+            :value="ruleForm.khNo"
+            :names="ruleForm.customer_name"
+            :placeholder="'购买方公司'"
+            :size="'mini'"
+            @searchChange="customerChange"
+            :disabled="type === 'view'"
+            :is-detail="type === 'view'"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="所属平台" prop="expect_wish">
+          <search-terrace
+            :value="ruleForm.platform_code"
+            :disabled="type === 'view'"
+            :size="'mini'"
+            :isDetail="type === 'view'"
+            :names="platform_code_name"
+            :placeholder="'所属平台'"
+            @searchChange="platform_code_codesearchChange"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="咨询截止时间" prop="endtime">
+          <el-date-picker
+            v-model="ruleForm.endtime"
+            type="datetime"
+            value-format="yyyy-MM-dd hh:mm:ss"
+            style="width: 100%"
+            :picker-options="pickerOptions"
+            placeholder="咨询截止时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="咨询类型" prop="is_project">
+          <el-select
+            v-model="ruleForm.is_project"
+            style="width: 100%"
+            placeholder="咨询类型"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             >
-              <el-option
-                v-for="item in expect_options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="异常备注" prop="anomalous_remark">
-            <el-input
-              type="textarea"
-              placeholder="请输入异常原因备注"
-              v-model="ruleForm.anomalous_remark"
-              :disabled="id !== 'add'"
-              maxlength="250"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
 
-      <el-col :span="24">
-        <el-form-item label="异常图片" prop="anomalous_images">
-          <div class="el-form-item-error-img">
-            <ul>
-              <li
-                class="images_li"
-                :style="getMargin_li()"
-                v-for="(item, index) in ruleForm.anomalous_images"
-                :key="item"
-              >
-                <img :src="item" alt="" style="width: 254px; height: 164px" />
-                <i
-                  class="el-icon-close"
-                  v-if="
-                    id === 'add' "
-                  @click="imgClose(index)"
-                ></i>
-              </li>
-            </ul>
-            <div
-              class="btnupload"
-              :style="getMargin()"
-              v-if="ruleForm.anomalous_images.length < 5 && id === 'add'"
-              style="position: relative"
-              @click="open"
-            >
-              <i class="el-icon-plus avatar-uploader-icon"></i>
-              <file-upload
-                class="Upload"
-                :accept="'.jpg,.png,.jpeg'"
-                :multiple="true"
-                :uploadcondition="beforeAvatarUpload"
-                @UploadErrorEvent="UploadErrorEvent"
-                @UploadSuccessEvent="UploadSuccessEvent"
-              />
-            </div>
-          </div>
+      <el-col :span="8">
+        <el-form-item label="项目名称" prop="anomalous_remark">
+          <el-input
+            placeholder="项目名称"
+            v-model="ruleForm.anomalous_remark"
+            :disabled="id !== 'add'"
+            maxlength="250"
+            show-word-limit
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="项目总预算" prop="anomalous_remark">
+          <el-input
+            placeholder="项目总预算"
+            v-model="ruleForm.anomalous_remark"
+            disabled
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="项目用途" prop="anomalous_remark">
+          <el-input
+            placeholder="项目用途"
+            v-model="ruleForm.anomalous_remark"
+            disabled
+            maxlength="500"
+          />
         </el-form-item>
       </el-col>
 
@@ -140,16 +140,28 @@ export default {
       }
     };
     return {
-      isShow: true,
+      options: [
+        { value: "0", label: "非项目" },
+        { value: "1", label: "项目" },
+      ],
       loading: false,
-      disabled: true,
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 60 * 60 * 24 * 1000;
+        },
+      },
       status: "", //存储详情接口返的状态
       showModelThis: this.showModel,
       resign_name: "", //离职人
       hand_name: "", //交接人
       ruleForm: {
-        order_type: "1", //售后类型 1销售2咨询,
-        outCode: "", //
+        is_project: "1", //咨询类型 1销售2咨询,
+        projectNo: "", //项目编号
+        khNo: "", //客户编号
+        customer_name: "", //客户名称
+        endtime: "", //咨询截止时间
+        platform_code: "", //平台id
+        
         stock_out_numbers: "", //出库单编号
         anomalous_numbers: "", //异常数量
         anomalous_reason: "", //异常原因
@@ -247,11 +259,34 @@ export default {
     },
   },
   methods: {
-    //   关闭弹窗,直接隐藏表单
-    // async closeAddEdit() {
-    //   this.$emit("closeModel", false); //抛出一个事件,关闭弹窗
-    //
-    // },
+    //平台选择
+    platform_code_codesearchChange(e) {
+      if (e) {
+        const { id, code, label } = e;
+        this.ruleForm.platform_code = id ? [id] : [];
+        this.$refs.ruleForm.validateField("platform_code");
+      }
+    },
+    //销售方公司选择
+    company_idsearchChange(e) {
+      if (e) {
+        const { id, code, label } = e;
+        this.ruleForm.companyNo = code || "";
+      }
+      this.$refs.ruleForm.validateField("companyNo");
+    },
+    //购买方公司选择
+    customerChange(e) {
+      if (e && e.id) {
+        this.ruleForm.khNo = [e.code];
+        this.ruleForm.customer_name = e.label;
+      } else {
+        this.ruleForm.khNo = [];
+        this.ruleForm.customer_name = "";
+      }
+
+      this.$refs.ruleForm.validateField("khNo");
+    },
     closeAdd() {
       this.showModelThis = false;
     },
@@ -351,7 +386,7 @@ export default {
               title,
               message: "",
             });
-  this.$emit("refresh", false);
+            this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {
@@ -450,13 +485,13 @@ export default {
     },
     //图片上传失败
     UploadErrorEvent(res) {
-       if (res !== "break") {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("anomalous_images");
-       }
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.$refs.ruleForm.validateField("anomalous_images");
+      }
     },
-                //图片上传成功
-  async  UploadSuccessEvent(data) {
+    //图片上传成功
+    async UploadSuccessEvent(data) {
       const { url } = data;
       if (url === "noToken") {
         await this.logout();
@@ -466,7 +501,7 @@ export default {
         this.$refs.ruleForm.validateField("anomalous_images");
       }
     },
-    
+
     //判断图片规格
     beforeAvatarUpload(file) {
       let isJPG = false,

+ 162 - 181
src/views/sheetOrder/zixunOrder/detail.vue

@@ -1,146 +1,69 @@
 <template>
-  <div class="zixunOrderDetail pagePadding">
+  <div class="zixunOrderDetail">
     <div
-      style="width: 100%"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      class="zixunOrderDetail-main"
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
-      <p>{{ status }}---{{ powers }}</p>
-
-      <div class="detail-page-title">
-        <span>咨询售后申请编号:</span
-        ><span v-if="sitem">{{ sitem.returnCode }}</span>
-      </div>
-      <status-bar
-        v-if="newTime !== ''"
-        :newTime="newTime"
-        :options="statusOptions"
-        :status="status"
-      />
-      <el-tabs v-model="activeTabs">
-        <el-tab-pane label="业务详情" name="1">
-          <el-collapse v-model="activeNames" style="margin:-18px 0 0 0">
-            <el-collapse-item title="售后申请详情" name="1">
-              <show-data-table
-                :newTime="newTime"
+      <el-tabs v-model="projectTabs">
+        <el-tab-pane label="新建项目" name="0" v-if="queryType === 'add'">
+          <add-form
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :id="queryId"
+            :type="queryType"
+            :sitem="sitem"
+            @refresh="refresh"
+          />
+        </el-tab-pane>
+        <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">
+              <add-form
                 v-if="newTime !== ''"
+                :newTime="newTime"
+                :id="queryId"
+                :type="queryType"
                 :sitem="sitem"
-                :columns="ShowDataTableColumns"
-              >
-                <template slot="status">
-                  <el-tag
-                    :size="'mini'"
-                    :type="sitem.status == '0' ? 'warning' : ''"
-                    v-text="
-                      (
-                        statusOptions.find(
-                          (item) => item.value == sitem.status
-                        ) || {}
-                      ).label || '--'
-                    "
-                  ></el-tag>
-                </template>
-                <template slot="order_type">
-                  <el-tag :size="'mini'" :type="''">{{
-                    sitem.status === "1"
-                      ? "销售出库单"
-                      : sitem.status === "2"
-                      ? "咨询出库单"
-                      : "--"
-                  }}</el-tag>
-                </template>
-                <template slot="except_code">
-                  <el-tag :size="'mini'" :type="''">{{
-                    sitem.except_code === "1"
-                      ? "退货"
-                      : sitem.except_code === "2"
-                      ? "换货"
-                      : sitem.except_code === "2"
-                      ? "改变售价"
-                      : "--"
-                  }}</el-tag>
-                </template>
-              </show-data-table>
-              <!-- <add-edit-form
-            :sitem="sitem"
-            :newTime="newTime"
-            v-if="newTime != ''"
-          ></add-edit-form> -->
+                @refresh="refresh"
+              />
             </el-collapse-item>
-            <el-collapse-item
-              title="业务审核"
-              name="1"
-              v-if="status == '0' && powers.some((item) => item == '043')"
-            >
-              <exam-form
-                v-if="newTime != ''"
-                :statusList="statusList"
+            <el-collapse-item title="设置项目毛利率" name="1">
+              <!-- <gross-form
+                v-if="newTime !== ''"
                 :newTime="newTime"
-                :disabled="false"
-                :isMust="false"
-                @searchChange="examForm"
-              />
+                :id="queryId"
+                :type="queryType"
+                :sitem="sitem"
+                @refresh="initForm()"
+              /> -->
             </el-collapse-item>
             <el-collapse-item
-              title="供应商反馈"
+              title="采购部定价"
               name="2"
-              v-if="
-                (status == '1' && powers.some((item) => item == '046')) ||
-                status == '2' ||
-                status == '3' ||
-                status == '4' ||
-                status == '5'
-              "
+              v-if="status == '1' && powers.some((item) => item == '057')"
             >
-              <supplier-feedback
-                v-if="newTime != ''"
-                :sitem="sitem"
-                :newTime="newTime"
-                @refresh="initData()"
-              />
+              444
             </el-collapse-item>
 
             <el-collapse-item
-              title="采购审核"
+              title="财务定价"
               name="3"
-              v-if="
-                (status == '2' && powers.some((item) => item == '036')) ||
-                status == '3' ||
-                status == '4' ||
-                status == '5'
-              "
+              v-if="status == '2' && powers.some((item) => item == '058')"
             >
-              <purchase-check
-                v-if="newTime != ''"
-                :sitem="sitem"
-                :newTime="newTime"
-                @refresh="initData()"
-              />
+              555
             </el-collapse-item>
+
             <el-collapse-item
-              title="填写物流"
+              title="财务审核定价"
               name="4"
-              v-if="
-                (status == '3' && powers.some((item) => item == '045')) ||
-                status == '4' ||
-                status == '5'
-              "
+              v-if="status == '3' && powers.some((item) => item == '059')"
             >
-              <return-express
-                v-if="newTime != ''"
-                :sitem="sitem"
-                :newTime="newTime"
-                @refresh="initData"
-              ></return-express>
+              666
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="2">
-          <process-time-line
-            v-if="newTime !== ''"
-            :newTime="newTime"
-            :type="'ZXSHD'"
-            :orderCode="orderCode"
-          />
+        <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
+          111
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -150,25 +73,26 @@
   </div>
 </template>
    <script>
-import mixinPage from "@/mixins/elPaginationHandle";
+import asyncRequest from "@/apis/service/sheetOrder/project";
 import resToken from "@/mixins/resToken";
-import asyncRequest from "@/apis/service/sheetOrder/zixunOrder";
-import addEditForm from "./components/addEditForm.vue";
-import supplierFeedback from "./components/supplier_feedback";
-
-import PurchaseCheck from "./components/purchase_check";
-import ReturnExpress from "./components/returnExpress";
-import ShowDataTableColumns from "./ShowDataTableColumns";
+import { mapGetters } from "vuex";
+import addForm from "./components/addEditForm";
+// import grossForm from "./components/grossForm";
+// import financeExamOneForm from "./components/finance-exam-one-form";
+// import financeExamTwoForm from "./components/finance-exam-two-form";
+// import financeExamThreeForm from "./components/finance-exam-three-form";
 export default {
   name: "zixunOrderDetail",
-  mixins: [mixinPage, resToken],
+  mixins: [resToken],
   components: {
-    addEditForm,
-    PurchaseCheck,
-    ReturnExpress,
-    supplierFeedback,
+    addForm,
+    // grossForm,
+    // financeExamOneForm,
+    // financeExamTwoForm,
+    // financeExamThreeForm,
   },
   computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       let tran =
         this.$store.getters.btnList.find(
@@ -181,98 +105,155 @@ export default {
       }
     },
   },
+
   data() {
     return {
-      activeNames: ["0", "1", "2", "3", "4", "10"],
-      s_status: "", //存储详情接口状态
       statusList: [],
-      sitem: null,
+      size: "small",
+      projectTabs: "1",
+      projectNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
       newTime: "",
       loading: false,
-      ShowDataTableColumns: ShowDataTableColumns,
-      statusOptions: [
-        { value: "0", label: "业务审核" },
-        { value: "1", label: "物流信息反馈" },
-        // { value: "2", label: "反馈物流费" },
-        { value: "3", label: "填写退货信息" },
-        // { value: "4", label: "已退货" },
-        { value: "5", label: "售后退货单创建成功" },
-      ],
-      orderCode: "",
-      return_code: "",
-      code: "",
+      queryType: "",
+      queryId: "",
+      status: "",
+      sitem: null,
     };
   },
   mounted() {
-    this.code = this.$route.query.id;
-
-    this.initData();
+    this.initForm();
   },
   methods: {
-    getNewTime() {
-      this.newTime = new Date().valueOf();
+    async initForm() {
+      const { id, type } = this.$route.query;
+      this.queryId = id;
+      this.queryType = type;
+      this.projectTabs = type === "add" ? "0" : "1";
+      this.loading = true;
+      if (this.queryType === "add") {
+        this.sitem = {};
+        this.getNewTime();
+      } else {
+        await this.initData();
+      }
+
+      this.loading = false;
     },
     // 点击业务审核的保存按钮
+
     async examForm(e) {
       console.log(e);
       if (!this.loading) {
-        let type = e.state === "1" ? "1" : "0";
-        console.log(type);
-        await this.setstatus(type, "提交业务审核", e.remark);
+        let model = {
+          activity_code: this.queryId,
+          status: e.state === "1" ? "1" : "8",
+          remark: e.remark,
+        };
+        await this.setstatus("提交产品部门审核", model);
       }
     },
-    //
-    async setstatus(type, detail, remark) {
-      await this.$confirm(`确定要${type === "1" ? "同意" : "驳回"}?`, {
+    async setstatus(detail, model) {
+      await this.$confirm(`确定要${detail}?`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(async () => {
-          // if (this.sitem) {
-          // let { returnCode } = this.sitem;
-          const model = {
-            remark,
-            returnCode: this.code,
-            status: type,
-          };
-          let res = await asyncRequest.status(model);
-
+          let res = await asyncRequest.actstatus(model);
           if (res && res.code === 0) {
             this.$notify.success({
-              title: "修改成功!",
+              title: "提交成功!",
               message: "",
             });
-            await this.initData();
+            await this.initForm();
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {
             this.$message.warning(res.message);
           }
-          // }
         })
         .catch(() => {
           console.log("取消");
         });
     },
-    async initData() {
+    handleClick(row) {
+      console.log(row);
+    },
+    async refresh(e) {
+      const { projectNo } = e;
       let model = {
-        returnCode: this.code,
+        id: this.queryType === "add" ? projectNo : this.queryId,
+        type: "view",
       };
-      const res = await asyncRequest.detail(model);
-      if (res && res.code === 0 && res.data) {
-        this.status = res.data.status;
-        this.sitem = res.data;
-        this.orderCode = res.data.returnCode;
+      this.routeReGoto("zixunOrderDetail", model);
+      await this.initForm();
+    },
+    async initData() {
+      this.loading = true;
+      const { code, message, data } = await asyncRequest.detail({
+        projectNo: this.queryId,
+      });
+      this.loading = false;
+      console.log(data);
+      if (code === 0) {
+        this.sitem = JSON.parse(JSON.stringify(data));
+        const { status } = this.sitem;
+        this.status = status;
         this.getNewTime();
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(message);
       }
     },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
   },
 };
 </script>
-   
+   <style lang="scss" scoped>
+.zixunOrderDetail {
+  position: relative;
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+  .zixunOrderDetail-main {
+    overflow-y: scroll;
+    position: relative;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+  }
+  .zixunOrderDetail-title {
+    border-top: 1px solid #ebeef5;
+    span {
+      height: 50px;
+      line-height: 50px;
+      font-family: "微软雅黑", sans-serif;
+      font-weight: 400;
+      font-style: normal;
+      font-size: 16fpx;
+      text-align: left;
+    }
+  }
+  /deep/ .ddiv {
+    border-top: 1px solid #dcdfe6;
+  }
+  /deep/ .dtitle {
+    width: 40px;
+    text-align: center;
+    height: 100%;
+    min-height: 100%;
+    ul {
+      padding: 12px 0 0 0;
+    }
+  }
+  /deep/ .dmain {
+    padding: 20px 0 0 0;
+    width: calc(100% - 40px);
+    border-left: 1px solid #dcdfe6;
+  }
+}
+</style>
    

+ 26 - 18
src/views/sheetOrder/zixunOrder/index.vue

@@ -86,6 +86,16 @@
                   刷新
                 </el-button>
               </el-col>
+              <el-col :span="4" class="fr" style="width: 66px">
+                <el-button
+                  type="warning"
+                  class="fr"
+                  :size="searchSize"
+                  @click="restSearch"
+                >
+                  重置
+                </el-button>
+              </el-col>
             </el-row>
             <el-row style="padding-top: 10px">
               <el-col :span="4" style="width: 291px">
@@ -135,14 +145,22 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <el-col :span="4" class="fr" style="width: 66px">
+
+              <el-col
+                :span="3"
+                class="fr"
+                style="width: 66px; padding: 0 0 0 10px"
+                v-if="powers.some((item) => item == '003')"
+              >
                 <el-button
-                  type="warning"
-                  class="fr"
                   :size="searchSize"
-                  @click="restSearch"
+                  type="success"
+                  style="float: right"
+                  @click="
+                    routeGoto('zixunOrderDetail', { id: 'add', type: 'add' })
+                  "
                 >
-                  重置
+                  添加
                 </el-button>
               </el-col>
             </el-row>
@@ -194,19 +212,13 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('zixunOrderDetail', { id: scope.row.returnCode })"
+              @click="
+                routeGoto('zixunOrderDetail', { id: scope.row.returnCode })
+              "
             ></i>
           </el-tooltip>
         </template>
       </ex-table>
-      <add-edit
-        :id="modelId"
-        :sitem="sitem"
-        :show-model="showModel"
-        :is-detail="isDetail"
-        @refresh="searchList"
-        @cancel="showModel = false"
-      />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -218,16 +230,12 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/sheetOrder/zixunOrder";
-import addEdit from "./components/addEdit.vue";
 import columns from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
   name: "zixunOrder",
   mixins: [mixinPage, resToken],
-  components: {
-    addEdit,
-  },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {