部署

src/apis/axios.js

@@ -88,6 +88,7 @@ export default async (
   return new Promise((resolve, reject) => {
     axios(obj)
       .then(response => {
+        // console.log(response)
         resolve(response.data)
       })
       .catch(res => {

src/apis/service/network/orderEntry/index.js

@@ -11,9 +11,11 @@ export default {
   // 查出全部税率
   list4: (data, params) => http(api + "ratelist", data, "post", params),
   // 分页查询
-  list: (data, params) => http(api + "supplierlist", data, "post", params),
+  list: (data, params) => http(api + "interlist", data, "post", params),
   // 网络部订单录入接口
   add: (data, params) => http(api + "interadd", data, "post", params),
+  // 网络部订单详情
+  detail: (data, params) => http(api + "interinfo", data, "post", params),
   // 网络部订单编辑
-  update: (data, params) => http(api + "interadd", data, "post", params),
+  update: (data, params) => http(api + "intersave", data, "post", params),
 }

src/config/env.development.js

@@ -4,8 +4,8 @@ module.exports = {
   baseUrl: 'http://localhost:8080',
   api: {
     // baseApi: 'http://inv.sit.wanyuhengtong.com/',
-    // baseApi: 'http://www.invoice.com/',
-    baseApi: 'http://inv.sitw.wanyuhengtong.com/',
+    baseApi: 'http://www.invoice.com/',
+    // baseApi: 'http://inv.sitw.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',

src/config/env.staging.js

@@ -3,8 +3,8 @@ module.exports = {
   title: '采销平台结算系统',
   baseUrl: 'http://mobile.recruit.sit.zretchome.com',
   api: {
-    baseApi: 'http://inv.sitw.wanyuhengtong.com/',
-    // tableApi: 'http://inv.sit.wanyuhengtong.com/',
+    // baseApi: 'http://inv.sitw.wanyuhengtong.com/',
+    baseApi: 'http://inv.sit.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',

src/views/network/orderEntry/addEdit.vue

@@ -71,9 +71,9 @@
               ></el-input-number> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="单据号" prop="a5">
+            <el-form-item label="单据号" prop="sequenceNo">
               <el-input
-                v-model.trim="ruleForm.a5"
+                v-model.trim="ruleForm.sequenceNo"
                 placeholder="请输入单据号"
                 :disabled="isDetail"
                 maxlength="200"
@@ -349,7 +349,7 @@ export default {
             trigger: "blur",
           },
         ],
-        a5: [
+        sequenceNo: [
           {
             required: true,
             message: "请输入单据号",
@@ -504,40 +504,62 @@ export default {
       //CMP20210608140627719  北京万宇恒通国际科贸有限公司
       //GYS-20210416-0316 北京顺捷玖芊科技有限公司
 
-      this.searchName1 = "泰康人寿云南分公司玉溪中支";
-      this.searchName2 = "北京万宇恒通国际科贸有限公司";
-      this.searchName3 = "北京顺捷玖芊科技有限公司";
-      this.searchName4 = "13";
-      this.ruleForm = {
-        khNo: ["KH202104272612"],
-        companyNo: ["CMP20210608140627719"],
-        supplierNo: ["GYS-20210416-0316"],
-        sale_name: "张三",
-        department: "网络部",
-        qrdType: "客服确认单",
-        good_total: 0,
-        a5: "xxxxxx",
-        poNo: "yyyyyy",
-        contactor: "李四",
-        mobile: "17744520491",
-        addr: "北京市东城区",
-        sendtime: "",
-        goodName: "商品名称",
-        goodPice: 0,
-        goodNum: 0,
-        cgd_tax: 0,
-        tax: [],
-      };
-      // const res = await asyncRequest.detail({ companyNo: this.id });
-      // if (res && res.code === 0) {
-      //   // this.ruleForm = res.data;
+      const res = await asyncRequest.detail({ id: this.id });
+      if (res && res.code === 0) {
+        const {
+          addr,
+          cgd_tax,
+          contactor,
+          department,
+          goodName,
+          goodNum,
+          goodPice,
+          good_total,
+          khNo,
+          mobile,
+          poNo,
+          qrdType,
+          sale_name,
+          sendtime,
+          supperinfo,
+          supplier,
+          supplierNo,
+          companyNo,
+          sequenceNo,
+          khName,
+          tax,
+          reteid,
+        } = res.data;
 
-      //   // this.ruleForm.companyNo = this.id;
-      // } else if (res && res.code >= 100 && res.code <= 104) {
-      //   await this.logout();
-      // } else {
-      //   this.$message.warning(res.message);
-      // }
+        this.searchName1 = khName;
+        this.searchName2 = supperinfo;
+        this.searchName3 = supplier;
+        this.searchName4 = tax;
+        this.ruleForm = {
+          khNo: [khNo],
+          companyNo: [companyNo],
+          supplierNo: [supplierNo],
+          sale_name: sale_name,
+          department: department,
+          qrdType: qrdType,
+          good_total: good_total * 1,
+          sequenceNo: sequenceNo,//单据号
+          poNo: poNo,
+          contactor: contactor,
+          mobile: mobile,
+          addr: addr,
+          sendtime: sendtime,
+          goodName: goodName,
+          goodPice: goodPice * 1,
+          goodNum: goodNum * 1,
+          cgd_tax: cgd_tax * 1,
+          tax: [reteid],
+        };
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
     },
     async resetForm() {
       // 重置
@@ -554,17 +576,17 @@ export default {
         khNo: [],
         companyNo: [],
         supplierNo: [],
-        sale_name: "张三",
+        sale_name: "",
         department: "网络部",
         qrdType: "客服确认单",
         good_total: 0,
-        a5: "xxxxxx",
-        poNo: "yyyyyy",
-        contactor: "李四",
-        mobile: "17744520491",
-        addr: "北京市东城区",
+        sequenceNo: "",
+        poNo: "",
+        contactor: "",
+        mobile: "",
+        addr: "",
         sendtime: "",
-        goodName: "商品名称",
+        goodName: "",
         goodPice: 0,
         goodNum: 0,
         cgd_tax: 0,
@@ -600,6 +622,10 @@ export default {
           obj.tax = obj.tax[0];
           obj.buyer = obj.sale_name;
           obj.buy_depart = obj.department;
+          obj.id=this.id
+          for (let key in obj) {
+            obj[key] = obj[key] + "";
+          }
           let res = {};
           if (this.id === "add") {
             delete obj["id"];
@@ -607,6 +633,7 @@ export default {
           } else {
             res = await asyncRequest.update(obj);
           }
+          console.log(res);
           this.loading = false;
           if (res && res.code === 0) {
             const title = this.id === "add" ? "添加成功！" : "修改成功！";

src/views/network/orderEntry/index.vue

@@ -33,14 +33,14 @@
                   @timeReturned="timeReturned($event)"
                 ></period-date-picker>
               </el-col>
-              <el-col :span="8" style="width: 360px">
+              <el-col :span="8" style="width: 400px">
                 <el-input
                   :size="searchSize"
                   v-model="input"
                   placeholder="关键字"
                 >
                   <el-select
-                    style="width: 115px"
+                    style="width: 125px"
                     v-model="select"
                     slot="prepend"
                     placeholder="请选择"
@@ -52,21 +52,23 @@
                   </el-select>
                 </el-input>
               </el-col>
-              <el-col :span="3" style="width: 195px; float: right">
+              <el-col :span="3" style="width: 60px; float: right">
                 <el-button
                   v-if="powers.some((item) => item == '002')"
                   :size="searchSize"
                   type="primary"
-                  style="float: right; margin-left: 5px"
+                  style="float: right; margin-left: 10px"
                   @click="searchList"
                 >
                   刷新
-                </el-button>
+                </el-button></el-col
+              >
+              <el-col :span="3" style="width: 60px; float: right">
                 <el-button
                   v-if="powers.some((item) => item == '003')"
                   :size="searchSize"
                   type="success"
-                  style="float: right; margin: 0"
+                  style="float: right; margin-left: 10px"
                   @click="openModal('add', false)"
                 >
                   添加
@@ -76,7 +78,7 @@
             <el-col :span="24" style="padding: 0">
               <el-col :span="8" style="width: 470px">
                 <search-select
-                  :code="parmValue.a1"
+                  :code="code1"
                   :placeholder="'确认单购买方公司名称'"
                   @end="searchChange1"
                   :type="'1'"
@@ -85,7 +87,7 @@
               </el-col>
               <el-col :span="8" style="width: 470px">
                 <search-select
-                  :code="parmValue.a2"
+                  :code="code2"
                   :placeholder="'采购单供应商名称'"
                   @end="searchChange2"
                   :type="'2'"
@@ -96,6 +98,95 @@
           </el-row>
         </div>
       </template>
+      <template #expand="{ scope }">
+        <el-form
+          label-position="right"
+          size="mini"
+          inline
+          label-width="130px"
+          class="demo-table-expand"
+        >
+          <el-row>
+            <!-- <el-col :span="8">
+              <el-form-item size="mini" label="客户属性">
+                <span>{{ scope.row.khzzxz }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item size="mini" label="客户分公司">
+                <span>{{ scope.row.khcomp }}</span>
+              </el-form-item>
+            </el-col> -->
+            <!-- <el-col :span="8">
+              <el-form-item size="mini" label="平台">
+                <span>{{ scope.row.suppitem }}</span>
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="12">
+              <el-form-item size="mini" label="商品名称">
+                <span>{{ scope.row.product_name }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="部门">
+                <span>{{ scope.row.depart }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="单价">
+                <span>{{ scope.row.sale_price }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="数量">
+                <span>{{ scope.row.order_num }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="单据号">
+                <span>{{ scope.row.sequenceNo }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="PO编号">
+                <span>{{ scope.row.poNo }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="税点">
+                <span>{{ scope.row.tax }}%</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="确认单类型">
+                <span>{{ scope.row.qrd_type }}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item size="mini" label="已回款总金额">
+                <span>{{ scope.row.apay_fee }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="未回款总金额">
+                <span>{{ scope.row.wpay_fee }}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item size="mini" label="确认单开票金额">
+                <span>{{ scope.row.ainv_fee }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="确认单未开票金额">
+                <span>{{ scope.row.winv_fee }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </template>
       <template #status="{ scope }">
         <el-tag
           :type="scope.row.status == '0' ? 'warning' : ''"
@@ -118,14 +209,7 @@
         <el-tooltip effect="dark" content="修改" placement="top">
           <i
             class="el-icon-edit tb-icon"
-            @click="openModal(scope.row.companyNo, false)"
-          ></i>
-        </el-tooltip>
-
-        <el-tooltip effect="dark" content="作废" placement="top">
-          <i
-            class="el-icon-video-pause tb-icon"
-            @click="statusConfirm(scope.row.companyNo, scope.row.status)"
+            @click="openModal(scope.row.id, false)"
           ></i>
         </el-tooltip>
       </template>
@@ -177,6 +261,8 @@ export default {
 
   data() {
     return {
+      code1: [],
+      code2: [],
       select: "1",
       input: "",
       isDetail: false,
@@ -198,6 +284,14 @@ export default {
       loading: false,
       modelId: 0,
       parmValue: {
+        qrdNo: "", //确认单编号
+        cgdNo: "", //采购单编号
+        sale_name: "", //业务员
+        cgd_sale: "", //采购员
+        endtime: "", //完成时间
+        starttime: "", //开始下单时间
+        khNo: "", //客户code
+        supplierNo: "", //供应商编号
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -217,27 +311,66 @@ export default {
       },
       // 表格 - 列参数
       columns: [
+        {
+          type: "expand",
+          label: "",
+          _slot_: "expand",
+        },
+        {
+          prop: "qrdNo",
+          label: "确认单编号",
+          width: "165px",
+          // fixed: "left",
+        },
+        {
+          prop: "sale_total",
+          label: "销售总额",
+          width: "100px",
+        },
+        {
+          prop: "sale_name",
+          label: "业务员",
+          width: "70px",
+        },
+        {
+          prop: "khNo",
+          label: "企业客户编码",
+          width: "125px",
+        },
+        {
+          prop: "khName",
+          label: "企业客户",
+          "min-width": "190px",
+        },
         {
           prop: "companyNo",
-          label: "信息编号",
+          label: "确认单销售公司编码",
+          width: "175px",
+        },
+        {
+          prop: "company",
+          label: "确认单销售公司",
+          "min-width": "190px",
+        },
+
+        {
+          prop: "cgdNo",
+          label: "采购单号",
+          width: "165px",
+        },
+        {
+          prop: "supplierNo",
+          label: "供应商编号",
+          width: "140px",
+        },
+        {
+          prop: "supplier",
+          label: "供应商",
           "min-width": "190px",
         },
         // {
-        //   prop: "company_name",
-        //   label: "单位名称",
-        // },
-        // {
-        //   prop: "company_license",
-        //   label: "纳税人识别号",
-        //   width: "190px",
-        // },
-        // {
-        //   prop: "bank_name",
-        //   label: "银行名称",
-        // },
-        // {
-        //   prop: "bankNo",
-        //   label: "银行卡号",
+        //   prop: "suppitem",
+        //   label: "平台",
         // },
         // {
         //   prop: "status",
@@ -246,28 +379,19 @@ export default {
         //   _slot_: "status",
         // },
         // {
-        //   prop: "contector",
-        //   label: "联系人",
+        //   prop: "poNo",
+        //   label: "po编号",
         // },
 
-        // {
-        //   prop: "mobile",
-        //   label: "联系电话",
-        // },
-        // {
-        //   prop: "company_address",
-        //   label: "地址",
-        // },
-        // {
-        //   prop: "addtime",
-        //   label: "创建时间",
-        //   width: "160px",
-        //   sortable: true,
-        // },
+        {
+          prop: "ordertime",
+          label: "创建时间",
+          width: "140px",
+        },
         {
           prop: "",
           label: "操作",
-          width: "120px",
+          width: "85px",
           fixed: "right",
           _noset_: true,
           _slot_: "operation",
@@ -281,9 +405,22 @@ export default {
   methods: {
     async searchList() {
       this.loading = true;
+      console.log("12345");
+      this.parmValue.qrdNo = this.select === "1" ? this.input : "";
+      this.parmValue.cgdNo = this.select === "2" ? this.input : "";
+      this.parmValue.sale_name = this.select === "3" ? this.input : "";
+      this.parmValue.cgd_sale = this.select === "4" ? this.input : "";
+      this.parmValue.khNo = this.code1.join(",");
+      this.parmValue.supplierNo = this.code2.join(",");
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
+        this.tableData.forEach((v1) => {
+          v1.apay_fee = this.setnum(v1.apay_fee);
+          v1.wpay_fee = this.setnum(v1.wpay_fee);
+          v1.ainv_fee = this.setnum(v1.ainv_fee);
+          v1.winv_fee = this.setnum(v1.winv_fee);
+        });
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
@@ -293,13 +430,26 @@ export default {
       }
       this.loading = false;
     },
+    setnum(s) {
+      let str = "";
+      if (isNaN(s)) {
+        str = "0";
+      } else if (typeof s == "undefined") {
+        str = "0";
+      } else if (!s && typeof s != "undefined" && s != 0) {
+        str = "0";
+      } else {
+        str = parseFloat(s + "").toFixed(2);
+      }
+      return str;
+    },
     async searchChange1(e) {
-      this.parmValue.a1 = JSON.parse(JSON.stringify(e));
+      this.code1 = JSON.parse(JSON.stringify(e));
       this.parmValue.page = 1;
       await this.searchList();
     },
     async searchChange2(e) {
-      this.parmValue.a2 = JSON.parse(JSON.stringify(e));
+      this.code2 = JSON.parse(JSON.stringify(e));
       this.parmValue.page = 1;
       await this.searchList();
     },

src/views/purchase/orderRecord/index.vue

@@ -687,6 +687,7 @@ export default {
           prop: "payNo",
           label: "付款编码",
           width: "180",
+          //  fixed: "left",
         },
         {
           prop: "dzNo",