修改bug

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1213,7 +1213,9 @@ export default {
       const names = [];
       const namePrices = [];
       rows.map(e => {
-        names.push(e.ename ? e.ename + ":" : "");
+        if (e.ename) {
+          names.push(e.ename);
+        }
         namePrices.push((e.goodName ? e.goodName : "") + ":" + e.amout);
       });
       this.data[index].partsDescribe = names.join(",");

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -982,8 +982,8 @@ export default {
         taxRate: "0",
         accDate: this.form.businesDate,
         srcType: 1,
-        tradeType: "GN",
-        optionType: "GN"
+        tradeType: "CK",
+        optionType: "CK"
       };
     },
     choceFun() {

src/views/exportTrade/purchaseInquiry/config/mainList.json

@@ -48,8 +48,8 @@
       "overHidden": true
     },
     {
-      "label": "订单状态",
-      "prop": "orderStatus",
+      "label": "是否询价",
+      "prop": "ifEnquiry",
       "search": true,
       "searchSpan": 8,
       "index": 4,

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -17,20 +17,28 @@
           size="small"
           v-if="detailData.status == 1"
           class="el-button--small-yh "
+          :disabled="form.ifEnquiry == '询价确认'"
           @click.stop="openEdit"
           >编辑
         </el-button>
         <el-button
           type="primary"
-          :disabled="detailData.status == 1"
+          :disabled="form.ifEnquiry == '询价确认'"
           v-if="detailData.status != 1"
           @click="editCustomer('submit')"
           size="small"
           >提交
         </el-button>
         <el-button
+          type="success"
+          :disabled="!form.id"
+          size="small"
+          @click="copyDoc"
+          >复制单据</el-button
+        >
+        <el-button
           type="primary"
-          :disabled="detailData.status == 1"
+          :disabled="form.ifEnquiry == '询价确认'"
           @click="editCustomer('save')"
           :loading="subLoading"
           v-if="detailData.status != 1"
@@ -52,9 +60,19 @@
             <crop-select
               v-model="form.corpId"
               corpType="KH"
-              :disabled="detailData.status == 1"
+              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"
             ></crop-select>
           </template>
+          <template slot="dateValidity">
+            <el-date-picker
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd 00:00:00"
+              v-model="form.dateValidity"
+              type="date"
+              placeholder="选择日期"
+              :picker-options="pickerOptions"
+            ></el-date-picker>
+          </template>
         </avue-form>
       </basic-container>
       <containerTitle title="商品信息"></containerTitle>
@@ -183,7 +201,7 @@
               icon="el-icon-plus"
               size="small"
               @click.stop="newDetails"
-              :disabled="detailData.status == 1"
+              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"
               >录入明细</el-button
             >
             <el-button
@@ -191,7 +209,6 @@
               icon="el-icon-printer"
               size="small"
               @click.stop="openReport()"
-              :disabled="detailData.status == 1"
               >报 表</el-button
             >
           </template>
@@ -201,7 +218,7 @@
               icon="el-icon-edit"
               type="text"
               @click="rowCell(row, index)"
-              :disabled="detailData.status == 1"
+              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"
               >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
             >
             <el-button
@@ -209,7 +226,7 @@
               icon="el-icon-edit"
               type="text"
               @click="rowDel(row, index)"
-              :disabled="detailData.status == 1"
+              :disabled="detailData.status == 1 || form.ifEnquiry == '询价确认'"
               >删 除</el-button
             >
           </template>
@@ -327,18 +344,13 @@ export default {
           {
             label: "系统号",
             prop: "sysNo",
-            span: 8
+            span: 8,
+            disabled: true
           },
           {
-            label: "订单状态",
-            prop: "orderStatus",
+            label: "是否询价",
+            prop: "ifEnquiry",
             span: 8,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_status",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
             disabled: true
           },
           {
@@ -360,9 +372,6 @@ export default {
             label: "有效日期",
             prop: "dateValidity",
             span: 8,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
             rules: [
               {
                 required: true,
@@ -520,11 +529,21 @@ export default {
     getGoods(1, 500).then(res => {
       this.goodsoptions = res.data.data.records;
     });
+    this.pickerOptions = {
+      disabledDate: time => {
+        var today = new Date();
+        today.setTime(today.getTime() - 24 * 60 * 60 * 1000);
+        return time.getTime() < today.getTime();
+      }
+    };
   },
   methods: {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    copyDoc() {
+      this.$emit("copyOrder", this.form.id);
+    },
     rowCorpData(row) {
       this.data[row.index].corpName = row.cname;
     },
@@ -707,6 +726,35 @@ export default {
       this.pageLoading = true;
       detail(id)
         .then(res => {
+          if (this.detailData.status == "copy") {
+            delete res.data.data.id;
+            delete res.data.data.sysNo;
+            delete res.data.data.orderNo;
+            delete res.data.data.orgOrderNo;
+            delete res.data.data.createTime;
+            delete res.data.data.createUser;
+            delete res.data.data.createUserName;
+            delete res.data.data.updateTime;
+            delete res.data.data.updateUser;
+            delete res.data.data.updateUserName;
+            delete res.data.data.morderNo;
+            delete res.data.data.status;
+            delete res.data.data.ifEnquiry;
+            delete res.data.data.ifShipping;
+            res.data.data.orderStatus = "录入";
+            if (res.data.data.orderItemsList) {
+              res.data.data.orderItemsList.forEach(e => {
+                delete e.id;
+                delete e.pid;
+                delete e.createTime;
+                delete e.createUser;
+                delete e.updateTime;
+                delete e.updateUser;
+                delete e.status;
+                delete e.isDeleted;
+              });
+            }
+          }
           this.form = res.data.data;
           this.data = res.data.data.orderItemsList
             ? res.data.data.orderItemsList
@@ -794,6 +842,7 @@ export default {
               this.olddata = this.deepClone(
                 res.data.data.orderItemsList ? res.data.data.orderItemsList : []
               );
+              this.option.disabled = true;
             });
           }
         } else {

src/views/exportTrade/purchaseInquiry/index.vue

@@ -17,6 +17,7 @@
         @saveColumn="saveColumn"
         @resetColumn="resetColumn"
         :summary-method="summaryMethod"
+        @selection-change="selectionChange"
         :cell-style="cellStyle"
       >
         <template slot="menuLeft">
@@ -27,6 +28,13 @@
             @click.stop="newAdd()"
             >创建单据
           </el-button>
+          <el-button
+            type="success"
+            size="small"
+            @click.stop="copyDoc()"
+            :disabled="selectionList.length != 1"
+            >复制单据</el-button
+          >
           <el-button type="info" size="small">报表</el-button>
         </template>
         <template slot="corpIdSearch">
@@ -86,7 +94,7 @@
             type="text"
             icon="el-icon-edit"
             size="small"
-            @click.stop="editOpen(scope.row, 2)"
+            @click.stop="editOpen(scope.row, 1)"
             >编辑
           </el-button>
           <el-button
@@ -101,6 +109,7 @@
     </basic-container>
     <detail-page
       @goBack="goBack"
+      @copyOrder="copyOrder"
       :detailData="detailData"
       v-if="!show"
     ></detail-page>
@@ -137,6 +146,7 @@ export default {
       },
       show: true,
       detailData: {},
+      selectionList: [],
       loading: false
     };
   },
@@ -148,6 +158,9 @@ export default {
       this.findObject(this.option.column, "portOfDestination").dicData =
         res.data;
     });
+    this.getWorkDicts("if_Inquiry").then(res => {
+      this.findObject(this.option.column, "ifEnquiry").dicData = res.data.data;
+    });
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
@@ -179,6 +192,9 @@ export default {
         });
       });
     },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
     //查看跳转页面
     beforeOpenPage(row, status) {
       this.detailData = {
@@ -194,6 +210,25 @@ export default {
       };
       this.show = false;
     },
+    copyDoc() {
+      this.selectionList.forEach(e => {
+        this.detailData = {
+          id: e.id,
+          status: "copy"
+        };
+        this.show = false;
+      });
+    },
+    copyOrder(id) {
+      this.show = true;
+      this.detailData = {
+        id: id,
+        status: "copy"
+      };
+      this.$nextTick(() => {
+        this.show = false;
+      });
+    },
     //点击搜索按钮触发
     searchChange(params, done) {
       if (params.businesDate) {

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1971,8 +1971,8 @@ export default {
         taxRate: "0",
         accDate: this.form.businesDate,
         srcType: 1,
-        tradeType: "GN",
-        optionType: "GN"
+        tradeType: "CK",
+        optionType: "CK"
       };
     },
     choceFun() {

src/views/maintenance/priceLibrary/index.vue

@@ -76,6 +76,14 @@
         <template slot-scope="{ row }" slot="status">
           {{ row.status | orderStateFormat }}
         </template>
+        <template slot-scope="{ row }" slot="ename">
+          <el-input
+            v-if="row.$cellEdit"
+            v-model="row.ename"
+            size="small"
+          ></el-input>
+          <span v-else>{{ row.ename }}</span>
+        </template>
         <template slot-scope="{ row }" slot="coefficient">
           <el-input
             v-if="row.$cellEdit"
@@ -96,6 +104,17 @@
           ></el-input>
           <span v-else>{{ row.price }}</span>
         </template>
+        <template slot-scope="{ row }" slot="endTime">
+          <el-date-picker
+            v-if="row.$cellEdit"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd 00:00:00"
+            v-model="row.endTime"
+            type="date"
+            placeholder="选择日期"
+          ></el-date-picker>
+          <span v-else v-html="row.endTime" />
+        </template>
         <template slot-scope="{ row }" slot="currency">
           <el-select
             size="small"
@@ -313,7 +332,7 @@ export default {
     editOpen(row, index) {
       if (row.$cellEdit == true) {
         submit({ ...row, tradeType: "CK" }).then(res => {
-          console.log(res);
+          this.onLoad(this.page, this.search);
           this.$set(row, "$cellEdit", false);
         });
       } else {
@@ -345,6 +364,29 @@ export default {
       this.loading = true;
       getList(page.currentPage, page.pageSize, params)
         .then(res => {
+          if (res.data.data.records) {
+            res.data.data.records.forEach(e => {
+              if (e.endTime) {
+                const today = new Date();
+                const endTime = new Date(e.endTime);
+                const curretMonth = new Date(
+                  today.getFullYear(),
+                  today.getMonth() + 1,
+                  0
+                );
+                const curretMonthDayCount = curretMonth.getDate();
+                const dateDiff = endTime.getTime() - today.getTime(); //时间差的毫秒数
+                const dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000)); //计算出相差天数
+                if (dayDiff < 0) {
+                  e.endTime =
+                    '<span style="color:red">' + e.endTime + "</span>";
+                } else if (dayDiff >= 0 && dayDiff < curretMonthDayCount) {
+                  e.endTime =
+                    '<span style="color:#9ACD32">' + e.endTime + "</span>";
+                }
+              }
+            });
+          }
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {

src/views/statisticAnalysis/salesProfit/index.vue

@@ -143,6 +143,18 @@ export default {
             width: 100
           },
           {
+            label: "费用应收",
+            prop: "fd",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "费用应付",
+            prop: "fc",
+            overHidden: true,
+            width: 100
+          },
+          {
             label: "单票利润",
             prop: "singleTicketMargin",
             overHidden: true,