暂存

src/apis/service/purchaseIn/purchaseOrder/detail.js

@@ -1,27 +0,0 @@
-// 物业管理员
-import http from "@/apis/axios";
-const api = "admin/";
-export default {
-  // 添加
-  add: (data, params) => http(api + "add", data, "post", params),
-  // 删除
-  delete: (data, params) => http(api + "delete", data, "post", params),
-  // 详情
-  detail: (data, params) => http(api + "cgdinfo", data, "post", params),
-  // 更新
-  update: (data, params) => http(api + "cgdedit", data, "post", params),
-  // 修改状态
-  status: (data, params) => http(api + "cgdstatus", data, "post", params),
-  // 新建入库单
-  orderinadd: (data, params) => http(api + "orderinadd", data, "post", params),
-  // 新建入库单详情
-  orderininfo: (data, params) => http(api + "orderininfo", data, "post", params),
-  // 异常原因列表
-  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
-  // 入库单验货
-  orderincheck: (data, params) => http(api + "orderincheck", data, "post", params),
-  // 入库单退货换货
-  orderinreturn: (data, params) => http(api + "orderinreturn", data, "post", params),
-  // 发货单状态修改
-  orderinstatus: (data, params) => http(api + "orderinstatus", data, "post", params),
-};

src/apis/service/purchaseIn/purchaseOrder/index.js

@@ -4,15 +4,26 @@ const api = "admin/";
 export default {
   // 添加
   add: (data, params) => http(api + "add", data, "post", params),
-  // 删除
-  delete: (data, params) => http(api + "delete", data, "post", params),
   // 分页查询
   list: (data, params) => http(api + "cgdlist", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
   // 详情
-  detail: (data, params) => http(api + "detail", data, "post", params),
+  detail: (data, params) => http(api + "cgdinfo", data, "post", params),
   // 更新
-  update: (data, params) => http(api + "update", data, "post", params),
+  update: (data, params) => http(api + "cgdedit", data, "post", params),
   // 修改状态
-  status: (data, params) => http(api + "accountstatus", data, "post", params),
+  status: (data, params) => http(api + "cgdstatus", data, "post", params),
+  // 新建入库单
+  orderinadd: (data, params) => http(api + "orderinadd", data, "post", params),
+  // 新建入库单详情
+  orderininfo: (data, params) => http(api + "orderininfo", data, "post", params),
+  // 异常原因列表
+  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
+  // 入库单验货
+  orderincheck: (data, params) => http(api + "orderincheck", data, "post", params),
+  // 入库单退货换货
+  orderinreturn: (data, params) => http(api + "orderinreturn", data, "post", params),
+  // 发货单状态修改
+  orderinstatus: (data, params) => http(api + "orderinstatus", data, "post", params),
 };
-   

src/views/purchaseIn/purchaseDiffOrder/purchaseIn-table.vue

@@ -21,7 +21,7 @@
   </div>
 </template>
    <script>
-// import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+// import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 // import purchaseOrderAddeditModel from "./purchase-order-addedit-model";
 import columns from "./columns";

src/views/purchaseIn/purchaseOrder/components/purchase-order-addEdit.vue

@@ -1,41 +1,4 @@
 <template>
-  <div>
-    <div class="tr">
-      <el-button
-        type="primary"
-        :size="'mini'"
-        @click="addForm"
-        v-if="status === '0' && powers.some((item) => item == '007')"
-        >修改
-      </el-button>
-      <el-button
-        type="primary"
-        plain
-        :size="'mini'"
-        @click="statusConfirm('1', '开始发货')"
-        v-if="status === '0' && powers.some((item) => item == '026')"
-        >开始发货
-      </el-button>
-      <el-button
-        @click="statusConfirm('0', '取消发货')"
-        plain
-        :size="'mini'"
-        v-if="status === '1' && powers.some((item) => item == '027')"
-        >取消发货</el-button
-      >
-      <el-button
-        @click="statusConfirm('-1', '作废该条信息')"
-        type="danger"
-        plain
-        :size="'mini'"
-        v-if="
-          status !== '' &&
-          status !== '5' &&
-          powers.some((item) => item == '015')
-        "
-        >作废该条信息</el-button
-      >
-    </div>
 
     <el-row class="purchaseOrderDetail-addForm">
       <el-col
@@ -48,38 +11,15 @@
         <div class="name">{{ sitem[colu.prop] }}</div>
       </el-col>
     </el-row>
-    <purchase-order-addedit-model
-      :id="modelId"
-      :show-model="showModel"
-      :sitem="detailSitem"
-      @refresh="refresh"
-      @cancel="showModel = false"
-    />
-  </div>
+
 </template>
    <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
-import resToken from "@/mixins/resToken";
-import purchaseOrderAddeditModel from "./purchase-order-addedit-model";
+// import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+
 import columns from "./columns";
 export default {
   name: "addEdit",
   props: ["id", "sitem", "newTime"],
-  mixins: [resToken],
-  components: { purchaseOrderAddeditModel },
-  computed: {
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchaseOrderDetail"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
   data() {
     return {
       columns: columns,
@@ -108,11 +48,7 @@ export default {
   },
   methods: {
     
-    addForm() {
-      this.detailSitem = this.sitem;
-      this.modelId = this.id;
-      this.showModel = true;
-    },
+   
 
     async initForm() {
       this.loading = true;
@@ -128,65 +64,6 @@ export default {
       }
       this.loading = false;
     },
-    refresh() {
-      this.showModelThis = false;
-      this.$emit("refresh");
-    },
-
-    async statusConfirm(status, message) {
-      await this.$confirm(`确定要${message}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          if (status === "-1") {
-            await this.deleteById(message);
-          } else {
-            await this.setStatus(status, message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-
-    async deleteById(message) {
-      const res = await asyncRequest.delete({ id: this.queryId });
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-
-        this.routeGoto("check", {});
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-
-    async setStatus(status, message, remark) {
-      let model = {
-        cgdNo: this.sitem.cgdNo,
-        remark: remark || "",
-        status: status,
-      };
-      const res = await asyncRequest.status(model);
-      this.loading = false;
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-        this.refresh();
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
   },
 };
 </script>

src/views/purchaseIn/purchaseOrder/components/purchase-order-addedit-model.vue

@@ -249,7 +249,7 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import rules from "./rules";
 export default {
@@ -346,12 +346,13 @@ export default {
             good_num,
             supplier_name,
             lasttime,
+            cgdNo
           } = this.sitem;
           this.good_price = good_price || "0";
           this.supplierName = supplier_name;
           this.lasttime = lasttime || "";
           this.ruleForm = {
-            cgdNo: this.id,
+            cgdNo: cgdNo||"",
             nake_fee: nake_fee || "0", //裸价
             wsm_code: wsm_code || "", //仓库
             cgder_id: "",

src/views/purchaseIn/purchaseOrder/components/purchase-order-in-table.vue

@@ -42,7 +42,7 @@
                 <i
                   class="el-icon-circle-plus-outline tb-icon"
                   style="color: #63cbe7"
-                  @click="openModal('add', '028')"
+                  @click="openModal()"
                 ></i>
               </el-tooltip>
             </template>
@@ -61,18 +61,14 @@
                     })
                   "
                 ></i>
-                {{}}
-                <!-- @click="routeGoto('purchaseOrderDetail', { id: scope.row.cgdNo })" -->
               </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
       </el-form>
       <wsm-in-order-model
-        :id="modelId"
         :show-model="showModel"
-        :btn_code="btn_code"
-        :modelSitem="modelSitem"
+        :sitem="modelSitem"
         @refresh="(showModel = false), $emit('refresh')"
         @cancel="showModel = false"
       />
@@ -148,27 +144,8 @@ export default {
         }
       });
     },
-    openModal(code, btn_code) {
-      this.btn_code = btn_code;
-      this.modelId = code;
-      const {
-        wsm_contactor,
-        wsm_mobile,
-        wsm_addr,
-        addr_code,
-        wsend_num,
-        cgdNo,
-        wsm_code,
-      } = this.sitem;
-      this.modelSitem = {
-        wsm_contactor,
-        wsm_mobile,
-        wsm_addr,
-        addr_code,
-        cgdNo,
-        wsm_code,
-        wsend_num,
-      };
+    openModal() {
+      this.modelSitem=this.sitem;
       this.showModel = true;
     },
     async submitForm() {

src/views/purchaseIn/purchaseOrder/components/rules.js

@@ -9,6 +9,8 @@ const validatePrice = (rule, value, callback) => {
     } else {
         if (isnumber2(value)) {
             callback();
+        } else if (isnumber(value)) {
+            callback();
         } else {
             callback(new Error("仅支持整数或两位小数!"))
         }

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-addEdit-form.vue

@@ -138,7 +138,7 @@
   </el-form>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber, isnumber2, isAlphanumeric } from "@/utils/validate";
 export default {

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-check-form.vue

@@ -126,7 +126,7 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import { isMobile, isLicense, isnumber, isPhone } from "@/utils/validate";
 export default {

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-error-model.vue

@@ -113,7 +113,7 @@
   </el-dialog>
 </template>
    <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 
 export default {

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-model.vue

@@ -20,7 +20,6 @@
             v-if="newTime !== ''"
             :id="id"
             :newTime="newTime"
-            :modelSitem="modelSitem"
             :sitem="sitem"
             @refresh="(showModelThis = false), $emit('refresh')"
           />
@@ -31,7 +30,7 @@
   </el-dialog>
 </template>
    <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import wsmInOrderAddEditForm from "./wsm-in-order-addEdit-form";
 
@@ -66,24 +65,7 @@ export default {
     
     async initForm() {
       this.loading = true;
-      this.sitem = null;
-      // btn_code
-      switch (this.btn_code) {
-        case "028":
-          this.title = "新建备货入库单";
-          break;
-        case "007":
-          this.title = "备货入库单详情";
-          break;
-        default:
-          this.title = "新建备货入库单";
-      }
-      if (this.btn_code !== "028") {
-        await this.initData();
-      } else {
-        this.sitem = {};
-        this.getNewTime();
-      }
+     
 
       this.loading = false;
     },

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-record-form.vue

@@ -132,7 +132,7 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate";
 import wsmInOrderErrorModel from "./wsm-in-order-error-model";

src/views/purchaseIn/purchaseOrder/components/wsm-in-order-return-form.vue

@@ -64,7 +64,7 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate";
 export default {

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -4,35 +4,72 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <div class="detail-page-title">
+      <p>{{ status }}---{{ powers }}</p>
+      <!-- class="detail-page-title" -->
+      <div style="height: 70px; padding: 20px 0 0 0">
         <span class="title">采购单编号：{{ queryId }}</span>
 
-        <div class="fr">
-          <el-button
-            type="primary"
-            :size="'mini'"
-            class="fr"
-            @click="diffAdd = true"
-            >填写总工差</el-button
-          >
-          <el-button
-            style="margin: 0 10px 0 0"
-            type="primary"
-            :size="'mini'"
-            class="fr"
-            @click="purchaseReturnAdd = true"
-            >新建采购单退货</el-button
-          >
-        </div>
+        <el-button
+          @click="statusConfirm('-1', '作废该条信息')"
+          type="danger"
+          plain
+          style="margin: 0 0 0 12px"
+          class="fr"
+          :size="'mini'"
+          v-if="
+            status !== '' &&
+            status !== '5' &&
+            powers.some((item) => item == '015')
+          "
+          >作废该条信息</el-button
+        >
+        <el-button
+          @click="statusConfirm('0', '取消发货')"
+          class="fr"
+          :size="'mini'"
+          style="margin: 0 0 0 12px"
+          v-if="status === '1' && powers.some((item) => item == '027')"
+          >取消入库</el-button
+        >
+        <el-button
+          type="primary"
+          class="fr"
+          style="margin: 0 0 0 12px"
+          :size="'mini'"
+          @click="statusConfirm('1', '开始发货')"
+          v-if="status === '0' && powers.some((item) => item == '026')"
+          >开始入库
+        </el-button>
+        <el-button
+          type="primary"
+          :size="'mini'"
+          class="fr"
+          style="margin: 0 0 0 12px"
+          @click="addForm"
+          v-if="status === '0' && powers.some((item) => item == '007')"
+          >修改采购反馈
+        </el-button>
 
-        <!-- <span class="fr">
-          <el-tag>
-            {{
-              (statusList.find((item) => item.code == status) || {}).label ||
-              "--"
-            }}
-          </el-tag>
-        </span> -->
+        <el-button
+          type="primary"
+          :size="'mini'"
+          class="fr"
+          v-if="
+            (status === '1' || status === '2') &&
+            powers.some((item) => item == '007')
+          "
+          style="margin: 0 0 0 12px"
+          @click="diffAdd = true"
+          >填写总工差</el-button
+        >
+        <el-button
+          type="primary"
+          :size="'mini'"
+          class="fr"
+          style="margin: 0 0 0 12px"
+          @click="purchaseReturnAdd = true"
+          >新建采购单退货</el-button
+        >
       </div>
       <status-bar
         v-if="newTime !== ''"
@@ -50,19 +87,17 @@
             :id="queryId"
             @refresh="initData()"
           />
-          <!-- 工差单表格 -->
-          <work-diff-table></work-diff-table>
+          <!-- <work-diff-table></work-diff-table> -->
         </el-collapse-item>
         <el-collapse-item title="备货入库单" name="2">
           <purchase-order-in-table
             :newTime="newTime"
-            v-if="newTime !== '' && status !== '' && status !== '0'"
+            v-if="newTime !== ''"
             :sitem="sitem"
             :id="queryId"
             @refresh="initData()"
           />
         </el-collapse-item>
-        <!--  -->
         <el-collapse-item title="审批记录" name="10">
           <process-time-line
             v-if="newTime !== ''"
@@ -85,6 +120,13 @@
         @refresh="initData"
         @cancel="purchaseReturnAdd = false"
       />
+      <purchase-order-addedit-model
+        :id="modelId"
+        :show-model="showModel"
+        :sitem="detailSitem"
+        @refresh="refresh"
+        @cancel="showModel = false"
+      />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -94,11 +136,12 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import purchaseOrderAddEdit from "./components/purchase-order-addEdit";
 import purchaseOrderInTable from "./components/purchase-order-in-table";
 import diffOrderAdd from "@/views/purchaseIn/purchaseDiffOrder/addEditModel";
-import WorkDiffTable from "./components/workDiff-table.vue";
+// import WorkDiffTable from "./components/workDiff-table.vue";
+import purchaseOrderAddeditModel from "./components/purchase-order-addedit-model";
 import PurchaseReturnAdd from "@/views/purchaseIn/purchaseReturn/addEdit.vue"; //采购单退货弹窗
 export default {
   name: "purchaseOrderDetail",
@@ -107,7 +150,8 @@ export default {
     purchaseOrderAddEdit,
     purchaseOrderInTable,
     diffOrderAdd,
-    WorkDiffTable,
+    purchaseOrderAddeditModel,
+    // WorkDiffTable,
     PurchaseReturnAdd, //采购单退货弹窗
   },
   computed: {
@@ -125,17 +169,19 @@ export default {
   },
   data() {
     return {
+      detailSitem: null,
+      modelId: "",
+      showModel: false,
+
       isMetal: false,
       finishStatus: "finish",
       activeNames: ["0", "1", "2", "3", "4", "5", "10"],
       sitem: null,
       statusOptions: [
-        { value: "0", label: "发货意见" },
-        { value: "1", label: "填写发货单" },
-        { value: "2", label: "部分发货" },
-        { value: "3", label: "发货完成" },
-        // { value: "4", label: "发货中" },
-        // { value: "5", label: "已发货" },
+        { value: "0", label: "待同意开始入库" },
+        { value: "1", label: "待入库" },
+        { value: "2", label: "部分入库" },
+        { value: "3", label: "入库完成" },
       ],
       statusList: [
         {
@@ -161,7 +207,7 @@ export default {
       queryId: "",
       diffAdd: false,
       orderCode: "",
-      purchaseReturnAdd:false,//采购单退货弹窗
+      purchaseReturnAdd: false, //采购单退货弹窗
     };
   },
   mounted() {
@@ -172,7 +218,11 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-
+    addForm() {
+      this.detailSitem = this.sitem;
+      this.modelId = this.id;
+      this.showModel = true;
+    },
     openModal() {
       this.diffAdd = true;
       this.purchaseReturnAdd = true;
@@ -199,6 +249,60 @@ export default {
       }
       this.loading = false;
     },
+    async statusConfirm(status, message) {
+      await this.$confirm(`确定要${message}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          if (status === "-1") {
+            await this.deleteById(message);
+          } else {
+            await this.setStatus(status, message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+
+    async deleteById(message) {
+      const res = await asyncRequest.delete({ id: this.queryId });
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: message + "成功！",
+          message: "",
+        });
+
+        this.routeGoto("check", {});
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+
+    async setStatus(status, message, remark) {
+      let model = {
+        cgdNo: this.sitem.cgdNo,
+        remark: remark || "",
+        status: status,
+      };
+      const res = await asyncRequest.status(model);
+      this.loading = false;
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: message + "成功！",
+          message: "",
+        });
+        await this.initData;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
   },
 };
 </script>

src/views/purchaseIn/purchaseReturn/components/purchase-order-addEdit.vue

@@ -21,7 +21,7 @@
   </div>
 </template>
    <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 // import purchaseOrderAddeditModel from "./purchase-order-addedit-model";
 import columns from "./columns";

src/views/purchaseIn/stockApply/addModel.vue

@@ -22,7 +22,7 @@
    <script>
 import addEdit from "./components/addEdit.vue";
 export default {
-  name: "storeManageFlow",
+  name: "stockApplyDetail",
   props: ["showModel", "id", "isDetail"],
   components: {
     addEdit,

src/views/purchaseIn/stockApply/index.vue

@@ -166,7 +166,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('stockApplyFlow', { id: scope.row.id })"
+              @click="routeGoto('stockApplyDetail', { id: scope.row.id })"
             ></i>
           </el-tooltip>
         </template>

src/views/purchaseIn/wsmInOrder/components/purchase-order-addEdit.vue

@@ -59,7 +59,7 @@
   </div>
 </template>
    <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import purchaseOrderAddeditModel from "./purchase-order-addedit-model";
 import columns from "./columns";

src/views/purchaseIn/wsmInOrder/components/purchase-order-addedit-model.vue

@@ -249,7 +249,7 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import rules from "./rules";
 export default {

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-addEdit-form.vue

@@ -139,7 +139,7 @@
   </el-form>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber, isnumber2, isAlphanumeric } from "@/utils/validate";
 export default {

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-check-form.vue

@@ -126,7 +126,7 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import { isMobile, isLicense, isnumber, isPhone } from "@/utils/validate";
 export default {

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-error-model.vue

@@ -113,7 +113,7 @@
   </el-dialog>
 </template>
    <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 
 export default {

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-model.vue

@@ -31,7 +31,7 @@
   </el-dialog>
 </template>
    <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import wsmInOrderAddEditForm from "./wsm-in-order-addEdit-form";
 
@@ -66,24 +66,24 @@ export default {
     
     async initForm() {
       this.loading = true;
-      this.sitem = null;
-      // btn_code
-      switch (this.btn_code) {
-        case "028":
-          this.title = "新建备货入库单";
-          break;
-        case "007":
-          this.title = "备货入库单详情";
-          break;
-        default:
-          this.title = "新建备货入库单";
-      }
-      if (this.btn_code !== "028") {
-        await this.initData();
-      } else {
-        this.sitem = {};
-        this.getNewTime();
-      }
+      // this.sitem = null;
+      // // btn_code
+      // switch (this.btn_code) {
+      //   case "028":
+      //     this.title = "新建备货入库单";
+      //     break;
+      //   case "007":
+      //     this.title = "备货入库单详情";
+      //     break;
+      //   default:
+      //     this.title = "新建备货入库单";
+      // }
+      // if (this.btn_code !== "028") {
+      //   await this.initData();
+      // } else {
+      //   this.sitem = {};
+      //   this.getNewTime();
+      // }
 
       this.loading = false;
     },

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-record-form.vue

@@ -132,7 +132,7 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate";
 import wsmInOrderErrorModel from "./wsm-in-order-error-model";

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-return-form.vue

@@ -64,7 +64,7 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate";
 export default {

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -105,7 +105,7 @@
 </template>
    <script>
 import resToken from "@/mixins/resToken";
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder/detail";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import wsmInOrderAddEditForm from "./components/wsm-in-order-addEdit-form";
 import wsmInOrderRecordForm from "./components/wsm-in-order-record-form";
 import wsmInOrderCheckForm from "./components/wsm-in-order-check-form";

src/views/serviceParam/unusualReason/addEdit.vue

@@ -3,7 +3,7 @@
     :title="title"
     :center="true"
     align="left"
-    top="5vh"
+    top="12vh"
     width="700px"
     @close="showModelThis = false"
     :close-on-click-modal="false"
@@ -13,7 +13,7 @@
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
   >
-    <el-card>
+    <el-card style="margin: -20px 0 0 0">
       <el-row :gutter="10">
         <el-col :span="24">
           <el-form
@@ -21,28 +21,42 @@
             status-icon
             :rules="rulesThis"
             ref="ruleForm"
-            label-width="110px"
+            label-width="80px"
             class="demo-ruleForm"
           >
-            <el-form-item
-              label="异常原因"
-              prop="result"
-              v-if="id === 'add' || (isDetail ? true : true)"
-            >
+            <el-form-item label="原因类型" prop="result">
+              <el-select
+                v-model="ruleForm.type"
+                placeholder="原因类型"
+                style="width: 100%"
+                :disabled="!(id === 'add')"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="原因标题" prop="result">
               <el-input
                 v-model="ruleForm.result"
                 :disabled="isDetail"
+                placeholder="原因标题"
+                maxlength="50"
+                show-word-limit
               ></el-input>
             </el-form-item>
 
-            <el-form-item
-              label="异常备注"
-              prop="result_desc"
-              v-if="id === 'add' || (isDetail ? true : true)"
-            >
+            <el-form-item label="原因备注" prop="result_desc">
               <el-input
                 :autosize="{ minRows: 4, maxRows: 10 }"
                 type="textarea"
+                placeholder="原因备注"
+                maxlength="250"
+                show-word-limit
                 v-model="ruleForm.result_desc"
                 :disabled="isDetail"
               ></el-input>
@@ -71,14 +85,29 @@ export default {
   data() {
     return {
       loading: false,
-      title: "添加账号",
+      title: "",
       showModelThis: this.showModel,
       ruleForm: {
+        type: "1",
         result: "", //入库验收异常原因
         result_desc: "", //入库异常备注
       },
       rulesThis: this.rules,
+      options: [
+        { id: "1", label: "入库验收异常" },
+        { id: "2", label: "退货验收异常" },
+        { id: "3", label: "售后退换货" },
+        { id: "4", label: "采购退货" },
+        { id: "5", label: "销售退换货" },
+      ],
       rules: {
+        type: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择原因类型",
+          },
+        ],
         result: [
           {
             required: true,
@@ -111,7 +140,6 @@ export default {
     },
   },
   methods: {
-    
     async initForm() {
       this.loading = true;
       if (this.id === "add") {
@@ -152,6 +180,7 @@ export default {
           this.ruleForm = {
             result: "", //入库验收异常原因
             result_desc: "", //入库异常备注
+            type: "1",
           };
         }
       });

src/views/serviceParam/unusualReason/index.vue

@@ -26,8 +26,18 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="3" style="width: 200px;">
-                <el-select v-model="parmValue.type" placeholder="原因类型">
+              <el-col :span="3" style="width: 210px">
+                <el-select
+                clearable
+                  v-model="parmValue.type"
+                  :size="searchSize"
+                  placeholder="原因类型"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
                   <el-option
                     v-for="item in options"
                     :key="item.id"
@@ -70,6 +80,15 @@
             </el-row>
           </div>
         </template>
+        <template #type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (options.find((item) => item.id == scope.row.type) || {}).label ||
+              '--'
+            "
+          ></el-tag>
+        </template>
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
@@ -236,7 +255,13 @@ export default {
         },
         {
           prop: "result",
-          label: "入库验收异常原因",
+          label: "原因标题",
+        },
+        {
+          prop: "type",
+          label: "原因类型",
+          _slot_: "type",
+          width: "150px",
         },
         {
           prop: "result_desc",