Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/approval/processConfig.js

@@ -0,0 +1,33 @@
+import request from '@/router/axios';
+
+export function getList(params) {
+  return request({
+    url: '/api/blade-check/auditpaths/list',
+    method: 'get',
+    params: params,
+  })
+}
+// 新增编辑
+export function modify(data) {
+  return request({
+    url: '/api/blade-check/auditpaths/modify',
+    method: 'post',
+    data: data,
+  })
+}
+// 列表删除
+export function removeList(data) {
+  return request({
+    url: '/api/blade-check/auditpaths/remove',
+    method: 'post',
+    data: data,
+  })
+}
+// 查看详情
+export function detailData(params) {
+  return request({
+    url: '/api/blade-check/auditpaths/detail',
+    method: 'get',
+    params: params,
+  })
+}

src/api/basicData/configuration.js

@@ -151,3 +151,10 @@ export const getlistBankBy = (corpsId) => {
     }
   })
 }
+// 下载模板
+export function downLoadTemplate() {
+  return request({
+    url: '/api/blade-purchase-sales/orderitems/exportPrice',
+    method: 'get'
+  })
+}

src/components/finance/applyPayment.vue

@@ -74,6 +74,10 @@
         },
         choceFun:{
           type:Function
+        },
+        arrList: {
+          type: Array,
+          default: [],
         }
       },
       data(){
@@ -206,8 +210,8 @@
                 ]
               },
               {
-                label: this.billData.itemType === "采购"?'付款日期':"收款日期",
-                prop: 'date',
+              label: this.billType == ("采购申请货款" || "销售申请退款")?'付款日期':"收款日期",
+              prop: 'date',
                 type:'date',
                 span: 8,
                 rules: [
@@ -296,9 +300,14 @@
         this.getWorkDicts("currency").then(res =>{
           this.currencyDic = res.data.data
         })
-        this.form.form = this.billData
-        this.corpId =  this.billData.corpId
-        this.configuration.dicData = this.billData.corpsName
+        if (this.arrList.length == 0) {
+          this.form.form = this.billData
+          this.corpId =  this.billData.corpId
+          this.configuration.dicData = this.billData.corpsName
+        }
+        if (this.arrList.length > 0) {
+          this.list = this.arrList
+        }
         this.addForm();
       },
       methods:{
@@ -341,7 +350,7 @@
                   this.$message.success("操作成功!")
                   this.$emit("choceFun");
                   //跳转付款申请页面
-                  if(this.$store.getters.takeStatus){
+                  if(this.$store.getters.pqStatus){
                     this.$alert("无法自动跳转到付款申请页面,因为页面已存在。", "温馨提示", {
                       confirmButtonText: "确定",
                       type: 'warning',

src/components/selectComponent/customerSelect.vue

@@ -11,6 +11,7 @@
         :collapse-tags="configuration.collapseTags?configuration.collapseTags:false"
         filterable
         remote
+        clearable
         @change="changeName"
         :remote-method="remoteMethod"
     >

src/views/approval/processConfig/config/detail.json

@@ -0,0 +1,69 @@
+{
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": false,
+  "addBtn":false,
+  "editBtn":false,
+  "delBtn": false,
+  "addRowBtn":false,
+  "cellBtn":false,
+  "cancelBtn":false,
+  "refreshBtn": false,
+  "searchMenuSpan": 6,
+  "dialogWidth": "60%",
+  "tree": true,
+  "border": true,
+  "index": true,
+  "indexLabel": "级别",
+  "selection": true,
+  "menuWidth": 100,
+  "dialogClickModal": false,
+  "column":[
+    {
+      "label": "路径名称",
+      "prop": "levelName",
+      "search": false,
+      "index": 1,
+      "overHidden": true,
+      "slot": true,
+      "searchSpan": 8
+    },
+    {
+      "label": "是否指定审批人",
+      "prop": "iffixAuditUser",
+      "search": false,
+      "index": 1,
+      "overHidden": true,
+      "slot": true,
+      "searchSpan": 8
+    },
+    {
+      "label": "审核人",
+      "prop": "auditUserId",
+      "search": false,
+      "index": 1,
+      "overHidden": true,
+      "slot": true,
+      "searchSpan": 8
+    },
+    {
+      "label": "是否最后一级",
+      "prop": "iffinalItem",
+      "search": false,
+      "index": 1,
+      "overHidden": true,
+      "slot": true,
+      "searchSpan": 8
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "search": false,
+      "index": 1,
+      "overHidden": true,
+      "slot": true,
+      "searchSpan": 8
+    }
+  ]
+}

src/views/approval/processConfig/config/mainList.json

@@ -0,0 +1,59 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 24,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "addBtn": false,
+  "align": "center",
+  "menuWidth": "120",
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "searchSpan": 8,
+  "searchMenuPosition": "right",
+  "column": [
+    {
+      "label": "审核路径名",
+      "prop": "pathName",
+      "search": true,
+      "index": 1,
+      "overHidden": true,
+      "searchSpan": 8
+    },
+    {
+      "label": "维护人",
+      "prop": "opUserName",
+      "search": false,
+      "index": 2,
+      "overHidden": true,
+      "searchSpan": 8
+    },
+    {
+      "label": "维护时间",
+      "prop": "opDate",
+      "search": false,
+      "index": 3,
+      "overHidden": true,
+      "searchSpan": 8
+    },
+    {
+      "label": "状态",
+      "prop": "status",
+      "search": false,
+      "index": 4,
+      "overHidden": true,
+      "searchSpan": 8
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "search": false,
+      "index": 5,
+      "overHidden": true,
+      "searchSpan": 8
+    }
+  ]
+}

src/views/approval/processConfig/index.vue

@@ -0,0 +1,327 @@
+<template>
+  <div>
+    <basic-container>
+      <avue-crud
+        ref="crud"
+        :option="option"
+        :data="dataList"
+        v-model="form"
+        :page.sync="page"
+        :search.sync="search"
+        :table-loading="loading"
+        @on-load="onLoad"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @saveColumn="saveColumn"
+      >
+        <template slot-scope="scope" slot="status">
+          <span v-if="scope.row.status == 'N'">新建</span>
+          <span v-if="scope.row.status == 'A'">有效</span>
+          <span v-if="scope.row.status == 'S'">停用</span>
+          <span v-if="scope.row.status == 'Z'">暂存</span>
+        </template>
+        <template slot="menuLeft">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="small"
+            @click.stop="addHandle"
+          >新增</el-button>
+        </template>
+        <template slot-scope="scope" slot="menu">
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="small"
+            @click.stop="editOpen(scope.row)"
+          >编辑
+          </el-button>
+          <el-button
+            type="text"
+            icon="el-icon-delete"
+            size="small"
+            @click.stop="rowDel(scope.row, scope.index)"
+          >删除
+          </el-button>
+        </template>
+      </avue-crud>
+    </basic-container>
+    <el-dialog
+      append-to-body
+      :visible.sync="visible"
+      width="80%"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :close-on-press-escape="false"
+      v-dialog-drag
+      :title="title"
+    >
+      <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm">
+        <el-form-item label="审核路径名称" prop="pathName">
+          <el-input v-model="dataForm.pathName" placeholder="审核路径名称"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="dataForm.status" placeholder="状态" style="width: 100%">
+            <el-option
+              v-for="item in optionsStatue"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="维护人" prop="opUserName">
+          <el-input v-model="dataForm.opUserName" disabled placeholder="维护人"></el-input>
+        </el-form-item>
+        <el-form-item label="维护时间" prop="opDate">
+          <el-input v-model="dataForm.opDate" disabled placeholder="维护时间"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" class="full" prop="remarks">
+          <el-input v-model="dataForm.remarks" placeholder="备注"></el-input>
+        </el-form-item>
+      </el-form>
+      <avue-crud
+        ref="dialogCrud"
+        :option="detailOption"
+        :data="detailData"
+      >
+        <template slot="levelName" slot-scope="{row,index}">
+          <el-input
+            v-model="row.levelName"
+            clearable
+            placeholder="请输入"
+          ></el-input>
+        </template>
+        <template slot="remarks" slot-scope="{row,index}">
+          <el-input
+            v-model="row.remarks"
+            clearable
+            placeholder="请输入"
+          ></el-input>
+        </template>
+        <template slot="iffixAuditUser" slot-scope="{row,index}">
+          <el-select
+            v-model="row.iffixAuditUser"
+          >
+            <el-option
+              label="是"
+              value="T"
+            ></el-option>
+            <el-option
+              label="否"
+              value="F"
+            ></el-option>
+          </el-select>
+        </template>
+        <template slot="iffinalItem" slot-scope="{row,index}">
+          <el-select
+            v-model="row.iffinalItem"
+          >
+            <el-option
+              label="是"
+              value="T"
+            ></el-option>
+            <el-option
+              label="否"
+              value="F"
+            ></el-option>
+          </el-select>
+        </template>
+        <template slot="auditUserId" slot-scope="{row,index}">
+          <el-select
+            v-model="row.auditUserId"
+            filterable
+            multiple
+            collapse-tags
+            placeholder="审核人"
+          ></el-select>
+        </template>
+        <template slot="menuLeft">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="small"
+            @click.stop="addDetail"
+          >新增</el-button>
+        </template>
+        <template slot-scope="{row,index}" slot="menu">
+          <el-button
+            type="text"
+            icon="el-icon-delete"
+            size="small"
+            @click="rowDetailDelete(detailData, index)"
+          >移除</el-button>
+        </template>
+      </avue-crud>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDia">取消</el-button>
+        <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import option from "./config/mainList.json";
+import detailOption from "./config/detail.json";
+import { getList, modify, removeList, detailData } from "@/api/approval/processConfig";
+
+export default {
+  name: "index",
+  data() {
+    return {
+      option: {},
+      dataList: [],
+      form: {},
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+      },
+      detailData: [],
+      loading: false,
+      search: {},
+      visible: false,
+      title: '',
+      detailOption: {},
+      optionsStatue: [
+        {
+          id: 'A',
+          name: '有效'
+        },
+        {
+          id: 'S',
+          name: '停用'
+        },
+      ],
+      dataForm: {
+        status: 'A',
+      },
+      dataRule: {},
+    }
+  },
+  created() {
+    this.option = option
+    this.detailOption = detailOption
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
+  },
+  methods: {
+    onLoad(page, params) {
+      params = {
+        ...params,
+        current: page.currentPage,
+        size: page.pageSize,
+      }
+      this.loading = true
+      getList(params).then(res => {
+        this.dataList = res.data.data.records ? res.data.data.records : [];
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    addHandle() {
+      this.title = '新增';
+      this.visible = !this.visible
+    },
+    // 编辑
+    editOpen(row) {
+      console.log(row)
+      detailData({id: row.id}).then(res => {
+        console.log(res)
+        this.dataForm = res.data.data
+        this.detailData = res.data.data.auditPathsLevels
+      })
+      this.title = '修改';
+      this.visible = !this.visible
+    },
+    rowDel(row, index) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return removeList(row.id);
+      }).then(() => {
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+      });
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    async saveColumn() {
+      // const inSave = await this.saveColumnData(
+      //   this.getColumnName(50),
+      //   this.option
+      // );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    addDetail() {
+      this.detailData.push({
+        levelName: null,
+        auditUserId: [],
+        iffixAuditUser: 'T',
+        iffinalItem: 'T',
+        remarks: null,
+        $cellEdit: true
+      })
+    },
+    rowDetailDelete(row, index) {
+      row.splice(index, 1)
+    },
+    closeDia() {
+      this.visible = false
+    },
+    dataFormSubmit() {
+      if (this.detailData.length === 0) {
+        this.$message.error('请维护审批级次')
+        return false
+      }
+      for (let x in this.detailData) {
+        if (this.detailData[x].iffixAuditUser === 'S') {
+          if (this.detailData[x].auditUserId === null || this.detailData[x].auditUserId === '' || this.dataList[x].auditUserId.length === 0) {
+            this.$message.error('请维护第' + (Number(x) + 1) + '级的审核人')
+            return false
+          }
+        }
+      };
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -9,8 +9,13 @@
       </div>
       <div class="add-customer-btn">
         <el-button
+          v-if="detailData.seeDisabled"
+          size="small"
+          @click="detailData.seeDisabled = false"
+          type="primary"
+        >编辑</el-button>
+        <el-button
           class="el-button--small-yh"
-          style="right: 245px;"
           type="primary"
           @click="revokeOutGoods"
           size="small"
@@ -19,7 +24,6 @@
         >撤销发货</el-button>
         <el-button
           class="el-button--small-yh"
-          style="right: 245px;"
           type="primary"
           @click="sendOutGoods"
           size="small"
@@ -29,7 +33,7 @@
         <el-button
           class="el-button--small-yh"
           size="small"
-          type="success" style="right: 140px;" @click="copyOrder"
+          type="success" @click="copyOrder"
           :disabled="detailData.seeDisabled || !form.id">
           复制新单
         </el-button>

src/views/businessManagement/deliveryNotice/index.vue

@@ -7,6 +7,7 @@
                  v-model="form"
                  :page.sync="page"
                  :search.sync="search"
+                 :table-loading="loading"
                  @row-del="rowDel"
                  @row-update="rowUpdate"
                  :before-open="beforeOpen"
@@ -122,6 +123,7 @@ export default {
       },
       form: {},
       search: {},
+      loading: false,
       option: {},
       parentId: 0,
       dataList: [],
@@ -338,9 +340,12 @@ export default {
         current: page.currentPage,
         billType:"FH"
       })
+      this.loading = true;
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+      }).finally(() => {
+        this.loading = false;
       })
     },
     //树桩列点击展开触发

src/views/businessManagement/inventoryAccount/index.vue

@@ -7,6 +7,7 @@
         :page.sync="page"
         @search-change="searchChange"
         :search.sync="search"
+        :table-loading="loading"
         @on-load="onLoad"
         @row-update="rowUpdate">
       <template slot-scope="{row,index}" slot="menu">
@@ -65,6 +66,7 @@ export default {
     return {
       data: [],
       search:{},
+      loading: false,
       excelForm: {},
       excelOption: {
         submitBtn: false,
@@ -171,9 +173,12 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
       })
+      this.loading = true;
       customerList(queryParams).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
+      }).finally(() => {
+        this.loading = false;
       })
     },
     rowUpdate(form, index, done) {

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -9,10 +9,16 @@
       </div>
       <div class="add-customer-btn">
         <el-button
+          v-if="detailData.seeDisabled"
+          size="small"
+          @click="detailData.seeDisabled = false"
+          type="primary"
+        >编辑</el-button>
+        <el-button
           size="small"
           class="el-button--small-yh"
           :disabled="detailData.seeDisabled || !this.form.id"
-          type="warning" style="right: 140px;"
+          type="warning"
           @click="applyPayment"
         >
           申请货款
@@ -20,7 +26,7 @@
         <el-button
           size="small"
           class="el-button--small-yh"
-          type="success" style="right: 140px;"
+          type="success"
           @click="copyOrder"
           :disabled="detailData.seeDisabled || !this.form.id"
         >
@@ -618,6 +624,16 @@ export default {
                 trigger: 'blur'
               }
             ]
+          }, {
+            label: '已付金额',
+            prop: 'a',
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
           },{
             label: "备注",
             span: 24,

src/views/businessManagement/purchaseOrder/index.vue

@@ -7,6 +7,7 @@
                  v-model="form"
                  :page.sync="page"
                  :search.sync="search"
+                 :table-loading="loading"
                  @row-del="rowDel"
                  :before-open="beforeOpen"
                  :before-close="beforeClose"
@@ -100,6 +101,7 @@ export default {
         clearable: true,
       },
       search: {},
+      loading: false,
       form: {},
       option: {},
       parentId: 0,
@@ -282,9 +284,12 @@ export default {
         // billType:'CG',
         // corpsTypeId: this.treeDeptId
       })
+      this.loading = true;
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+      }).finally(() => {
+        this.loading = false;
       })
     },
     //树桩列点击展开触发

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -9,8 +9,13 @@
       </div>
       <div class="add-customer-btn">
         <el-button
+          v-if="detailData.seeDisabled"
+          size="small"
+          @click="detailData.seeDisabled = false"
+          type="primary"
+        >编辑</el-button>
+        <el-button
           class="el-button--small-yh"
-          style="right: 245px;"
           type="primary"
           @click="revokeInGoods"
           size="small"
@@ -19,7 +24,6 @@
         >撤销收货</el-button>
         <el-button
           class="el-button--small-yh"
-          style="right: 245px;"
           type="primary"
           @click="sendInGoods"
           size="small"
@@ -29,7 +33,7 @@
         <el-button
           class="el-button--small-yh"
           size="small"
-          type="success" style="right: 140px;" @click="copyOrder"
+          type="success" @click="copyOrder"
           :disabled="detailData.seeDisabled || !this.form.id">
           复制新单
         </el-button>

src/views/businessManagement/receipt/index.vue

@@ -7,6 +7,7 @@
                  v-model="form"
                  :page.sync="page"
                  :search.sync="search"
+                 :table-loading="loading"
                  @row-del="rowDel"
                  @row-update="rowUpdate"
                  :before-open="beforeOpen"
@@ -124,6 +125,7 @@ export default {
       },
       form: {},
       search: {},
+      loading: false,
       option: {},
       parentId: 0,
       dataList: [],
@@ -337,7 +339,6 @@ export default {
         this.$delete(params,'businessDate')
       }
       if (params) {
-
       }
       let queryParams = Object.assign({}, params, {
         size: page.pageSize,
@@ -345,9 +346,12 @@ export default {
         billType:'SH',
         corpsTypeId: this.treeDeptId
       })
+      this.loading = true;
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+      }).finally(() => {
+        this.loading = false;
       })
     },
     //树桩列点击展开触发

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -153,6 +153,14 @@
       "overHidden": true
     },
     {
+      "label": "生产工厂",
+      "prop": "productionPlantName",
+      "search": false,
+      "index": 13,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "发货地址",
       "prop": "shippingAddress",
       "search": true,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -9,6 +9,12 @@
       </div>
       <div class="add-customer-btn">
         <el-button
+          v-if="detailData.seeDisabled"
+          size="small"
+          @click="detailData.seeDisabled = false"
+          type="primary"
+        >编辑</el-button>
+        <el-button
           class="el-button--small-yh"
           type="warning"
           :disabled="detailData.seeDisabled"
@@ -59,10 +65,16 @@
                 />
 <!--                所属公司带出银行信息-->
                 <selectComponent v-else-if="item.prop === 'belongToCorpId'"
-                                 v-model="form[item.prop]" :configuration="configuration"
+                                 v-model="form[item.prop]" :configuration="companyConfiguration"
                                  style="width: 100%"
                                  :disabled="detailData.seeDisabled"
                                  @returnBack="returnBack"/>
+<!--                生产工厂-->
+                <selectComponent v-else-if="item.prop === 'productionPlant'"
+                                 v-model="form[item.prop]" :configuration="plantConfiguration"
+                                 style="width: 100%"
+                                 :disabled="detailData.seeDisabled"
+                                 @getRow="getPlantRow"/>
                 <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
@@ -255,6 +267,29 @@
                          :disabled="detailData.seeDisabled"
                          @click.stop="openReport()"
               >报 表</el-button>
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-download"
+                @click="downloadHandle"
+              >下载模板</el-button>
+              <el-upload
+                :action="baseURL"
+                :headers="headers"
+                :disabled="detailData.seeDisabled"
+                :on-progress="uploading"
+                :show-file-list=false
+                accept=".xls,.xlsx"
+                multiple
+                :on-success="importTemplate"
+                style="float: right"
+              >
+                <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-upload"
+                >导 入</el-button>
+              </el-upload>
             </template>
           </avue-crud>
         </basic-container>
@@ -562,6 +597,8 @@ import customerDialog from "@/components/customer-dialog/main";
 //账单组件
 import ApplyPayment from "../../../components/finance/applyPayment";
 import reportDialog from "@/components/report-dialog/main";
+import { getToken } from "@/util/auth";
+import Cookies from 'js-cookie'
 
 export default {
   name: "detailsPage",
@@ -597,6 +634,20 @@ export default {
         placeholder: '请点击右边按钮选择',
         dicData: []
       },
+      plantConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
+      companyConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
       data: [],
       policyForm: {},
       dataPolicy: [],
@@ -983,7 +1034,7 @@ export default {
             ]
           }, {
             label: '生产工厂',
-            prop: 'a',
+            prop: 'productionPlant',
             span: 16,
             rules: [
               {
@@ -1152,6 +1203,8 @@ export default {
       // 查询时loading页面
       pageLoading: false,
       switchDialog: false,
+      baseURL: '/api/blade-purchase-sales/orderitems/importPrice',
+      headers: { "Blade-Auth": 'Bearer ' + getToken()},
     }
   },
   mounted() {
@@ -1210,7 +1263,10 @@ export default {
         this.bankOfDepositData = this.form.orderFilesList
         this.configuration.dicData = this.form.corpName
         if (this.form.belongToCorpList) {
-          this.configuration.dicData = this.configuration.dicData.concat(this.form.belongToCorpList)
+          this.companyConfiguration.dicData = this.form.belongToCorpList
+        }
+        if (this.form.productionPlantList) {
+          this.plantConfiguration.dicData = this.form.productionPlantList
         }
         let feesData = []
         this.form.orderFeesList.forEach(item => {
@@ -1393,6 +1449,62 @@ export default {
     openReport() {
       this.switchDialog =! this.switchDialog;
     },
+    // 下载模板
+    downloadHandle() {
+      this.$confirm('是否下载模板文件？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        window.open(
+          `/api/blade-purchase-sales/orderitems/exportPrice?${
+            this.website.tokenHeader
+          }=${getToken()}`
+        );
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      })
+    },
+    //文件上传时
+    uploading(event, file, fileList) {
+      this.pageLoading = true;
+      // this.openFullScreen(false, '文件正在解析中');
+    },
+    importTemplate(res, file) {
+      console.log(res)
+      this.pageLoading = false
+      let goodsData = []
+      res.data.forEach(item => {
+        this.$set(item, 'priceType', '一般')
+        this.$set(item, 'actualQuantity', '0')
+        this.$set(item, 'purchaseAmount', '0')
+        this.$set(item, 'price', '0')
+        this.$set(item, 'amount', '0')
+        this.$set(item, 'sort', this.maxFeeNum + 1)
+        this.maxFeeNum++
+        let a = {
+          cname: item.cname,
+        }
+        goodsData.push(a)
+      })
+      this.goodsConfiguration.dicData = this.goodsConfiguration.dicData.concat(goodsData)
+      this.removeGoodsRepeat()
+      this.contactsData = this.contactsData.concat(res.data)
+
+    },
+    //遮罩层
+    openFullScreen(res, text) {
+      const loading = this.$loading({
+        lock: true,
+        text: text,
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+      if (res === true) loading.close();
+    },
     onClose(val) {
       this.switchDialog = val;
     },
@@ -1539,6 +1651,9 @@ export default {
       this.$set(this.form, 'packageRemarks', data.remarks)
       this.$set(this.form, 'arrivalAddress', data.storageAddr)
     },
+    getPlantRow(data) {
+      this.$set(this.form, 'shippingAddress', data.storageAddr)
+    },
     getRow(event,row) {
       row.priceCategory = event[0].goodsTypeName
       this.$set(row, 'priceType', '一般')

src/views/businessManagement/salesOrder/index.vue

@@ -23,6 +23,7 @@
                  @on-load="onLoad"
                  @tree-load="treeLoad"
                  :cell-style="tableRowClassName"
+                 :table-loading="loading"
       >
         <template slot-scope="scope" slot="orgOrderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>
@@ -92,6 +93,7 @@ export default {
   },
   data() {
     return {
+      loading: false,
       configuration: {
         multipleChoices: false,
         multiple: false,
@@ -355,9 +357,12 @@ export default {
         billType:'XS',
         corpsTypeId: this.treeDeptId
       })
+      this.loading = true;
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+      }).finally(() => {
+        this.loading = false;
       })
     },
     //树桩列点击展开触发

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -9,7 +9,7 @@
           <el-button type="warning"
                      class="el-button--small-yh"
                      @click.stop="confirmSettlement"
-          >结算
+          >付费
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
@@ -412,7 +412,7 @@
         this.$refs["form"].validate((valid,done) => {
           done();
           if(valid){
-            this.$confirm("是否确认结算？", "提示", {
+            this.$confirm("是否确认付费？", "提示", {
               confirmButtonText: "确认",
               cancelButtonText: "取消",
               type: "warning",

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -11,7 +11,7 @@
                      class="el-button--small-yh"
                      :disabled="financeDisabled"
                      @click.stop="confirmSettlement"
-          >结算
+          >收费
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
@@ -417,7 +417,7 @@
         this.$refs["form"].validate((valid,done) => {
           done();
           if(valid){
-            this.$confirm("是否确认结算？", "提示", {
+            this.$confirm("是否确认收费？", "提示", {
               confirmButtonText: "确认",
               cancelButtonText: "取消",
               type: "warning",

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -173,6 +173,18 @@
                          clearable filterable>
                 <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
               </el-select>
+              <span v-else>{{ row.currency }}</span>
+            </template>
+            <template slot="cntrNo" slot-scope="{ row }">
+              <el-input
+                v-if="row.$cellEdit"
+                v-model="row.cntrNo"
+                placeholder="请输入"
+                size="small"
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+                @change="selectInventory(row)"
+              ></el-input>
+              <span v-else>{{ row.cntrNo }}</span>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
@@ -483,17 +495,18 @@ export default {
     if (this.detailData.form) {
       this.buttonLoading = true;
       this.form = JSON.parse(this.detailData.form);
-      this.$set(this.form,"saleman",this.detailData.form.salesName)
+      this.$set(this.form,"saleman",this.form.salesName)
       //是否计算合同号
       this.form.id = null
       this.form.sysNo = null
 
       this.form.orderItemsList.forEach((item, index) => {
         item.srcId = item.id
-        item.itemId = item.itemId
         item.orgOrderNo = this.form.orgOrderNo
         item.contractNumber = item.orgOrderNo
         item.contractAmount = item.amount
+        item.currency = this.form.currency
+        item.exRate = this.form.exchangeRate
         if (item.actualQuantity !== 0) {   //如果发过货
           item.actualQuantity = _.subtract(item.orderQuantity, item.actualQuantity); //发货件数 =  总件数 - 已发件数
         } else {
@@ -504,8 +517,10 @@ export default {
         //   BQ : _.divide(item.billWeight, item.orderQuantity),
         //   IQ : _.divide(item.invoiceWeight, item.orderQuantity)
         // }
-        delete item.actualQuantity
+        delete item.orderQuantity
         delete item.id
+        // this.$refs.crudContact.rowCellAdd(item);
+        // this.$refs.crudContact.rowCell(item,this.contactsData.length - 1)
       })
       this.contactsData = this.form.orderItemsList
       this.sumOrderNo();
@@ -577,12 +592,13 @@ export default {
     },
     //查询库存
     selectInventory(row) {
-      if (row.billNo && row.contractNumber && row.priceCategory && this.form.storageId) {
+      if (row.billNo && row.contractNumber && row.priceCategory && row.cntrNo && this.form.storageId) {
         const params = {
           billNo: row.billNo,
           contractNumber: row.contractNumber,
           priceCategory: row.priceCategory,
           storageId: this.form.storageId,
+          cntrNo: row.cntrNo
         }
         selectGoodsNum(params).then(res => {
           this.$set(this.contactsData[row.$index], "inventoryNumber", res.data.data)

src/views/purchase/contract/config/customerContact.json

@@ -129,7 +129,6 @@
       "prop": "taxRate",
       "index": 10,
       "width":120,
-      "cell": true,
       "rules": [
         {
           "required": false,

src/views/purchase/contract/detailsPage.vue

@@ -76,9 +76,15 @@
                 <el-select v-else-if="item.prop === 'currency'" style="width: 100%"    v-model="form[item.prop]" size="small" placeholder="请选择" @change="currencyChange" clearable filterable>
                   <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
                 </el-select>
+                <el-input type="age" v-else-if="item.type === 'unit'" v-model="form[item.prop]"  :disabled="item.disabled?true:false" size="small" autocomplete="off"  @change="currencyChange" placeholder="请输入">
+                  <template   slot="append">%</template>
+                </el-input>
                 <el-select v-else-if="item.prop === 'paymentType'"  style="width: 100%"  v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in paymentTypeDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
+                <!--<div v-else-if="item.prop === 'advancePayment'">
+                  <el-input type="textarea" v-else-if="(item.prop === 'advancePayment')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
+                </div>-->
                 <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
                 <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
               </el-form-item>
@@ -198,6 +204,17 @@
               ></el-input>
               <span v-else>{{ row.amount }}</span>
             </template>
+            <template slot="taxRate" slot-scope="{ row }">
+              <el-input v-if="row.$cellEdit"
+                        v-model="row.taxRate"
+                        size="small"
+                        autocomplete="off"
+                        placeholder="请输入">
+                <template slot="append"
+                >%</template>
+              </el-input>
+              <span v-else>{{ row.taxRate }}</span>
+            </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                 type="text"
@@ -249,7 +266,7 @@
       append-to-body
       class="el-dialogDeep"
       :visible.sync="applicationDialog"
-      width="70%"
+      width="60%"
       :close-on-click-modal="false"
       :destroy-on-close="true"
       :close-on-press-escape="false"
@@ -286,20 +303,16 @@
 import customerContact from "./config/customerContact.json"
 import uploadList from './config/uploadList.json'
 import advantageProject from "./config/advantageProject.json"
-import {getDeptLazyTree,customerList} from "@/api/basicData/basicFeesDesc";
+import { getDeptLazyTree } from "@/api/basicData/basicFeesDesc";
 import optionTwoCost from "./config/mainListCost.json"
-import {detailListData, submitData,getSysNo} from "@/api/importTrade/purchase";
-import commodity from "./config/commodity.json"
+import {detailListData, submitData} from "@/api/importTrade/purchase";
 import feeInfo from "@/components/fee-info/main";
 import uploadFile from "@/components/upload-file/main";
 import _ from "lodash";
 import  billApplication from "@/components/bill/billApplication";
 //商品详情接口
-import {corpsattn, corpsbank,  getDeptLazyTreeS} from "@/api/basicData/configuration"
-import { getList } from "@/api/basicData/commodityType"
+import { corpsattn } from "@/api/basicData/configuration"
 import { contrastObj,contrastList } from "@/util/contrastData";
-import {getSpecification} from "@/api/exportTrade/purchaseContract";
-import option from "./config/mainList.json";
 import ApplyPayment from "../../../components/finance/applyPayment";
 export default {
   name: "detailsPage",
@@ -457,7 +470,7 @@ export default {
             disabled:this.takeDisabled,
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -589,6 +602,7 @@ export default {
             prop: 'currency'
           }, {
             label: '汇率',
+            type:"unit",
             prop: 'exchangeRate',
           }, {
             label: '人民币金额',
@@ -758,20 +772,20 @@ export default {
     },
     //带出人民币
     currencyChange(){
-      if(this.form.orderAmount){
-        if(this.form.currency === "CNY"){
-          this.form.exchangeRate = 1
+      if(this.form.currency === "CNY" && this.form.exchangeRate == 6.368600){  //如果为人民币
+        this.form.exchangeRate = 1
+        if(this.form.orderAmount){   //合同金额不为0  赋值人民币金额
           this.$set(this.form,"rmbAmount",this.form.orderAmount)
-        }else{
-          if(this.form.exchangeRate != 6.368600){
-            this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, this.form.exchangeRate).toFixed(2))
-          }else{
-            this.form.exchangeRate = 6.3686
+        }
+      }else if(this.form.exchangeRate === 1){
+          this.form.exchangeRate = 6.3686
+          if(this.form.orderAmount){
             this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, 6.3686).toFixed(2))
           }
-        }
       }else{
-        this.$set(this.form,"rmbAmount","")
+        if(this.form.orderAmount && this.form.exchangeRate){
+          this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, this.form.exchangeRate).toFixed(2))
+        }
       }
     },
     //合计
@@ -888,7 +902,7 @@ export default {
         if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
           || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
         ){
-          this.$confirm("您已改动数据,是否先保存在进行操作!", {
+          this.$confirm("数据发生变化，请先提交保存？", {
             confirmButtonText: "保存",
             cancelButtonText: "取消",
             type: "warning"
@@ -964,7 +978,7 @@ export default {
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ){
-        this.$confirm("您已改动数据,是否先保存在进行操作!", {
+        this.$confirm("数据发生变化，请先提交保存？", {
           confirmButtonText: "保存",
           cancelButtonText: "取消",
           type: "warning"
@@ -1040,7 +1054,7 @@ export default {
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ){
-        this.$confirm("是否保存当前页面？", "提示", {
+        this.$confirm("数据发生变化，是否提交保存？", "提示", {
           confirmButtonText: "保存",
           cancelButtonText: "取消",
           type: "warning",

src/views/purchase/stockBill/config/mainList.json

@@ -7,7 +7,8 @@
   "tip": false,
   "searchShow": true,
   "searchMenuPosition": "right",
-  "searchMenuSpan": 6,
+  "searchSpan": 8,
+  "searchMenuSpan": 16,
   "tree": true,
   "selection": false,
   "addBtn": false,
@@ -15,140 +16,133 @@
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 150,
+  "menu": false,
+  "searchIcon": true,
+  "searchIndex": 2,
   "searchLabelWidth": 100,
-  "column": [
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
     {
-      "label": "状态",
-      "hide": true,
-      "prop": "status",
-      "search": true,
-      "width": 120,
-      "type": "select",
-      "dicData": [
-        {
-          "label": "已审核",
-          "value": "1"
-        },
-        {
-          "label": "正在结算",
-          "value": "4"
-        },
-        {
-          "label": "结算完成",
-          "value": "5"
-        }
-      ]
+      "name": "inAmount",
+      "type": "sum"
     },
     {
-      "label": "状态",
-      "prop": "strStatus",
-      "type": "select",
-      "overHidden": true,
-      "searchOrder": 5,
-      "width": 120
+      "name": "outAmount",
+      "type": "sum"
     },
     {
-      "label": "客户名称",
+      "name": "balanceAmount",
+      "type": "sum"
+    }
+  ],
+  "column": [
+    {
+      "label": "合同号",
+      "prop": "contractNumber",
       "overHidden": true,
-      "prop": "cornName",
-      "width": 220
+      "search": true,
+      "index": 1,
+      "width": 150
     },
     {
-      "label": "客户名称",
-      "hide": true,
+      "label": "提单号",
+      "overHidden": true,
       "search": true,
-      "prop": "cornId",
-      "searchOrder": 1
+      "prop": "billNo",
+      "index": 2,
+      "width": 150
     },
     {
-      "label": "服务项目",
-      "prop": "pname",
+      "label": "货物名称",
+      "search": true,
       "overHidden": true,
-      "width": 120
+      "index": 3,
+      "width": 220,
+      "prop": "cname"
     },
     {
-      "label": "任务部门",
-      "prop": "deptName",
+      "label": "箱号",
+      "prop": "cntrNo",
+      "index": 4,
       "overHidden": true,
       "width": 120
     },
     {
-      "label": "单价",
-      "prop": "price",
+      "label": "采购日期",
+      "search": true,
+      "prop": "createTime",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
       "overHidden": true,
-      "width": 120
+      "index": 5,
+      "width": 150
     },
     {
-      "label": "计价单位",
-      "prop": "unit",
+      "label": "入库件数",
+      "prop": "inQuantity",
       "overHidden": true,
+      "index": 6,
       "width": 120
     },
     {
-      "label": "数量",
-      "prop": "quantity",
+      "label": "入库发票重量",
+      "prop": "inWeight",
       "overHidden": true,
+      "index": 7,
       "width": 120
     },
     {
-      "label": "合计金额",
-      "prop": "amount",
+      "label": "入库金额",
+      "prop": "inAmount",
       "overHidden": true,
+      "index": 8,
       "width": 120
     },
     {
-      "label": "频率",
-      "prop": "frequency",
+      "label": "出库件数",
+      "prop": "outQuantity",
       "overHidden": true,
+      "index": 9,
       "width": 120
     },
     {
-      "label": "提醒日",
-      "prop": "reminderDay",
-      "valueFormat": "timestamp",
+      "label": "出库发票重量",
+      "prop": "outWeight",
       "overHidden": true,
-      "type": "date",
-      "width": 150
+      "index": 10,
+      "width": 120
     },
     {
-      "label": "需求开始日期",
-      "prop": "beginTime",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "type": "date",
-      "unlinkPanels": true,
-      "searchRange": true,
-      "search": true,
+      "label": "出库金额",
+      "prop": "outAmount",
       "overHidden": true,
-      "searchOrder": 3,
-      "width": 150,
-      "cell": true
+      "index": 11,
+      "width": 120
     },
     {
-      "label": "制单人",
-      "prop": "createUserName",
-      "disabled": true,
+      "label": "结余件数",
+      "prop": "balanceQuantity",
       "overHidden": true,
+      "index": 12,
       "width": 120
     },
     {
-      "label": "制单日期",
-      "prop": "createTime",
-      "disabled": true,
+      "label": "结余重量",
+      "prop": "balanceWeight",
       "overHidden": true,
-      "width": 150
-    },
-    {
-      "label": "最新修改人",
-      "prop": "updateUserName",
-      "width": 120,
-      "overHidden": true
+      "index": 13,
+      "width": 120
     },
     {
-      "label": "最新修改时间",
-      "prop": "updateTime",
-      "width": 150,
-      "overHidden": true
+      "label": "结余金额",
+      "prop": "balanceAmount",
+      "overHidden": true,
+      "index": 14,
+      "width": 120
     }
   ]
 }

src/views/purchase/stockBill/index.vue

@@ -20,7 +20,7 @@
 
 <script>
   import option from "./config/mainList.json";
-  import { getBillList } from "@/api/financialManagement/paymentRequest";
+  import {customerList} from "@/api/basicData/inventoryAccount"
 
   export default {
     data() {
@@ -45,7 +45,6 @@
 
     },
     mounted() {
-      option.height = window.innerHeight - 200 ;
     },
     methods: {
       //新单打开
@@ -90,17 +89,19 @@
         console.log('1')
       },
       onLoad(page, params = {}) {
-        // this.loading = true;
-        // if (params.createTime != undefined) {  //合同
-        //   params.createStartDate = params.createTime[0]+ " " + "00:00:00";
-        //   params.createEndDate = params.createTime[1] + " " + "23:59:59";
-        //   this.$delete(params,'createTime')
-        // }
-        // getBillList(page.currentPage, page.pageSize,params).then(res=>{
-        //   this.dataList = res.data.data.records
-        //   this.page.total = res.data.data.total
-        //   this.loading = false;
-        // })
+        this.loading = true;
+        if(params){
+          if (params.createTime!= undefined) {  //付款
+            params.createStartTime = params.createTime[0]+ " " + "00:00:00";
+            params.createEndTime = params.createTime[1] + " " + "23:59:59";
+            this.$delete(params,'createTime')
+          }
+        }
+        customerList(page.currentPage, page.pageSize,params).then(res=>{
+          this.dataList = res.data.data.records
+          this.page.total = res.data.data.total
+          this.loading = false;
+        })
       },
     }
   }

src/views/salesManagement/salesContract/detailsPage.vue

@@ -60,7 +60,7 @@
                 </el-select>
                 <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
                 <selectComponent v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]" :configuration="bConfiguration"/>
-                <el-input type="age" v-else-if="item.prop === 'downPayment'" v-model="form[item.prop]"  @change="downPaymentChange"  :disabled="item.disabled?true:false" size="small" autocomplete="off" placeholder="请输入">
+                <el-input type="age" v-else-if="item.type === 'unit'" v-model="form[item.prop]"  @change="downPaymentChange"  :disabled="item.disabled?true:false" size="small" autocomplete="off" placeholder="请输入">
                   <template slot="append">%</template>
                 </el-input>
                 <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
@@ -116,10 +116,12 @@
               <span v-else>{{ row.orgOrderNo }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 v-if="row.$cellEdit"
                 v-model="row.price"
                 placeholder="请输入"
+                style="width: 90%"
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
                 @input="priceChange(row)"
@@ -127,6 +129,7 @@
               <span v-else>{{ row.price }}</span>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 v-if="row.$cellEdit"
                 v-model="row.orderQuantity"
@@ -138,7 +141,9 @@
               <span v-else>{{ row.orderQuantity }}</span>
             </template>
             <template slot="priceCategory" slot-scope="{row,index}">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <goods-select
+                style="width:90% !important;"
                 v-if="row.$cellEdit"
                 v-model="row.priceCategoryNames"
                 @valueName="(value) => valueName(value,row)"
@@ -148,9 +153,11 @@
               <span v-else>{{ row.priceCategoryNames }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 v-if="row.$cellEdit"
                 v-model="row.invoiceWeight"
+                style="width: 90%"
                 placeholder="请输入"
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
@@ -159,10 +166,12 @@
               <span v-else>{{ row.invoiceWeight }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 v-if="row.$cellEdit"
                 v-model="row.billWeight"
                 placeholder="请输入"
+                style="width: 90%"
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @input="billWeightChange(row)"
@@ -171,10 +180,12 @@
               <span v-else>{{ row.billWeight }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 v-if="row.$cellEdit"
                 v-model="row.amount"
                 placeholder="请输入"
+                style="width: 90%"
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
               ></el-input>
@@ -449,6 +460,7 @@ export default {
             prop: 'currency',
           }, {
             label: '汇率',
+            type:"unit",
             prop: 'exchangeRate',
             rules: [
               {
@@ -472,6 +484,7 @@ export default {
           },
           {
             label: '首付比例',
+            type:"unit",
             prop: 'downPayment',
             rules: [
               {
@@ -717,14 +730,13 @@ export default {
     },
     //汇率
     currencyChange(value){
-      if(this.form.orderAmount){
-        if(value === "CNY"){
-          this.form.exchangeRate = 1
-          // this.form.rmbAmount = this.form.orderAmount
-        }else{
-          this.form.exchangeRate = 6.3843
-          // this.form.rmbAmount =  _.multiply(this.form.orderAmount, 6.3843)
-        }
+      if(value === "CNY" &&  this.form.exchangeRate ==6.384300){
+        this.$set(this.form,"exchangeRate",1)
+        this.form.exchangeRate = 1
+        // this.form.rmbAmount = this.form.orderAmount
+      }else if( this.form.exchangeRate ===  1){
+        this.$set(this.form,"exchangeRate",6.384300)
+        // this.form.rmbAmount =  _.multiply(this.form.orderAmount, 6.3843)
       }
     },
     //单价