Merge branch 'sit'

src/apis/url-config.js

@@ -1,12 +1,16 @@
-import { api, ding } from '@/config'
+import { api, ding, webUrl } from '@/config'
+console.log(webUrl);
+const { userApi, baseApi } = api
+const { CorpId, AgentId } = ding
 export default {
   //后端user接口url
-  userURL: api.userApi,
+  userURL: userApi,
   //后端接口url
-  baseURL: api.baseApi,
+  baseURL: baseApi,
   //企业id
-  corpId: ding.CorpId,
+  corpId: CorpId,
   //应用凭证
-  agentId: ding.AgentId,
-  // tableURL: api.tableApi,
+  agentId: AgentId,
+  // tableURL: tableApi,
+  webUrl: webUrl
 }

src/config/env.development.js

@@ -12,6 +12,7 @@ module.exports = {
     // userApi: 'http://inv.sitw.wanyuhengtong.com/',
     // baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
+  webUrl:'http://share.sitw.wanyuhengtong.com/#/test-good-share?id=',
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {

src/config/env.production.js

@@ -10,6 +10,7 @@ module.exports = {
     userApi: 'http://inv.sitw.wanyuhengtong.com/',
     baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
+  webUrl:'http://share.sitw.wanyuhengtong.com/#/good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {

src/config/env.staging.js

@@ -8,11 +8,12 @@ module.exports = {
     tableApi: 'http://inv.sit.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,
+  webUrl: 'http://share.sitw.wanyuhengtong.com/#/test-good-share?id=',
   appId: 'wx5ac3a2c2d72b6f26',
-  ding:{
-     //企业id
-     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
-     //应用凭证
-     AgentId:"1324690581"
+  ding: {
+    //企业id
+    CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
+    //应用凭证
+    AgentId: "1324690581"
   }
 }

src/views/purchaseIn/purchaseOrder/components/tolerance.vue

@@ -0,0 +1,43 @@
+<template>
+  <span>
+    <el-button
+      type="primary"
+      :size="'mini'"
+      class="fr"
+      style="margin: 0 0 0 12px"
+      @click="diffAdd = true"
+      >填写总工差</el-button
+    >
+    <add-edit-model
+      :sitem="sitem"
+      :show-model="diffAdd"
+      @refresh="initData"
+      @cancel="diffAdd = false"
+    />
+  </span>
+</template>
+
+<script>
+import addEditModel from "@/views/purchaseIn/purchaseDiffOrder/addEditModel";
+
+export default {
+  components: {
+    addEditModel,
+  },
+  props: ["id", "sitem", "newTime"],
+  mixins: [resToken],
+  data() {
+    return {
+      diffAdd: false,
+    };
+  },
+  mounted: {
+    initData() {
+      console.log("34");
+    },
+  },
+};
+</script>
+
+<style  lang="scss" scoped>
+</style>

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -20,14 +20,14 @@
             sitem.noble_name
           " -->
 
-        <el-button
+        <!-- <el-button
           type="primary"
           :size="'mini'"
           class="fr"
           style="margin: 0 0 0 12px"
           @click="diffAdd = true"
           >填写总工差</el-button
-        >
+        > -->
       </div>
       <!-- <status-bar
         v-if="newTime !== ''"
@@ -164,12 +164,6 @@
           />
         </el-tab-pane>
       </el-tabs>
-      <add-edit-model
-        :sitem="sitem"
-        :show-model="diffAdd"
-        @refresh="initData"
-        @cancel="diffAdd = false"
-      />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -183,13 +177,12 @@ import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import orderInTable from "./components/order-in-table";
 import ShowDataTableColumns from "./components/ShowDataTableColumns";
 import { order_type_options, statusOptions } from "./columns";
-import addEditModel from "@/views/purchaseIn/purchaseDiffOrder/addEditModel";
+
 export default {
   name: "purchaseOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
     orderInTable,
-    addEditModel,
   },
 
   computed: {
@@ -219,7 +212,6 @@ export default {
       newTime: "",
       loading: false,
       queryId: "",
-      diffAdd: false,
       orderCode: "",
       ReturnAddModel: false, //采购单退货弹窗
     };

src/views/sellOut/project/detail.vue

@@ -70,7 +70,10 @@
           name="3"
           v-if="
             queryType !== 'add' &&
-            (status === '3' || status === '4' || status === '5'|| status === '6')
+            (status === '3' ||
+              status === '4' ||
+              status === '5' ||
+              status === '6')
           "
         >
           <set-plan
@@ -102,6 +105,7 @@ import addForm from "./components/addForm";
 import grossForm from "./components/grossForm";
 import backGoodShow from "./components/backGoodShow";
 import setPlan from "./components/setPlan";
+import urlConfig from "@/apis/url-config";
 export default {
   name: "projectDetail",
   mixins: [resToken],
@@ -200,9 +204,10 @@ export default {
     handleClick(row) {
       console.log(row);
     },
-    copyToClip(title) {
-      const { host } = window.location;
-      let url = `${host}/#/${title}?id=${this.queryId}`;
+    copyToClip() {
+      console.log(urlConfig);
+      let url = `${urlConfig.webUrl}${this.queryId}`;
+      console.log(url);
       let aux = document.createElement("input");
       aux.setAttribute("value", url);
       document.body.appendChild(aux);
@@ -212,7 +217,6 @@ export default {
       this.$message.warning("分享链接已成功复制至粘贴板！");
     },
     async refresh(e) {
-     
       this.routeReGoto("project", {});
     },
     async initData() {

src/views/sellOut/sellAfterApply/detail.vue

@@ -218,10 +218,10 @@ export default {
         { value: "1", label: "待业务审核" },
         { value: "2", label: "待采购审核" },
         { value: "3", label: "待设置仓库" },
-        { value: "4", label: "待退回" },
-        { value: "5", label: "业务已驳回" },
-        { value: "6", label: "采购已驳回" },
-        { value: "7", label: "售后已完成" },
+        { value: "4", label: "待客户退货" },
+        { value: "5", label: "售后已完成" },
+        { value: "6", label: "业务已驳回" },
+        { value: "7", label: "采购已驳回" },
       ],
       orderCode: "",
       return_code: "",

src/views/sellOut/sellAfterApply/index.vue

@@ -263,9 +263,10 @@ export default {
         { id: "1", label: "待业务审核" },
         { id: "2", label: "待采购审核" },
         { id: "3", label: "待设置仓库" },
-        { id: "4", label: "售后已完成" },
-        { id: "5", label: "业务已驳回" },
-        { id: "6", label: "采购已驳回" },
+        { id: "4", label: "待客户退货" },
+        { id: "5", label: "售后已完成" },
+        { id: "6", label: "业务已驳回" },
+        { id: "7", label: "采购已驳回" },
       ],
       statusList: statusList,
       loading: false,