列表、创建人、修改人、日期,进项销项发票细节

src/views/financialManagement/billDetails/billDetails.vue

@@ -30,6 +30,12 @@
           :configuration="breakConfiguration"
         ></breakdown-select>
       </template>
+      <template slot-scope="scope" slot="corpId">
+        <span>{{ scope.row.corpName }}</span>
+      </template>
+      <template slot-scope="scope" slot="costType">
+        <span>{{ scope.row.itemName }}</span>
+      </template>
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"

src/views/financialManagement/billDetails/configuration/mainList.json

@@ -53,15 +53,9 @@
       "index": 3
     },
     {
-      "label": "客户名称",
+      "label": "往来单位",
       "prop": "corpId",
       "search": true,
-      "hide": true,
-      "overHidden": true
-    },
-    {
-      "label": "往来单位",
-      "prop": "corpName",
       "overHidden": true,
       "width": 200,
       "index": 4
@@ -94,19 +88,13 @@
     },
     {
       "label": "费用名称",
-      "prop": "itemName",
+      "prop": "costType",
+      "search": true,
       "overHidden": true,
       "width": 150,
       "index": 5
     },
     {
-      "label": "费用名称",
-      "prop": "costType",
-      "search": true,
-      "hide": true,
-      "overHidden": true
-    },
-    {
       "label": "单价",
       "prop": "price",
       "width": 120,

src/views/financialManagement/incomeInvoice/configuration/invoicepage.json

@@ -36,7 +36,6 @@
       "label": "费用项目",
       "prop": "serverName",
       "overHidden": true,
-      "cell": true,
       "width": 200,
       "index": 4,
       "rules": [
@@ -51,7 +50,6 @@
       "label": "规格型号",
       "prop": "typeno",
       "overHidden": true,
-      "cell": true,
       "width": 150,
       "index": 7,
       "rules": [

src/views/financialManagement/incomeInvoice/configuration/mainList.json

@@ -39,11 +39,6 @@
       "label": "往来单位",
       "prop": "corpId",
       "search": true,
-      "hide": true
-    },
-    {
-      "label": "往来单位",
-      "prop": "corpName",
       "overHidden": true,
       "width": 200,
       "index": 4
@@ -110,11 +105,43 @@
       "index": 8
     },
     {
+      "label": "创建人",
+      "prop": "createUserName",
+      "overHidden": true,
+      "index": 9,
+      "width":100
+    },
+    {
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 10,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
+      "overHidden": true,
+      "index": 11,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 12,
+      "width":160
+    },
+    {
       "label": "备注",
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 12,
+      "index": 13,
       "width": 230
     }
   ]

src/views/financialManagement/incomeInvoice/incomeInvoice.vue

@@ -41,7 +41,7 @@
       <template slot-scope="scope" slot="srcOrderno">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno }}</span>
       </template>
-      <template slot-scope="scope" slot="corpName">
+      <template slot-scope="scope" slot="corpId">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
       </template>
     </avue-crud>
@@ -116,16 +116,25 @@
       //新单打开
       addReceipt(row){
         this.detailData = {
-          id: row.id,
-          status: 1
+          id: row.id
         };
         this.show = false;
         this.$store.commit("INCOME_IN_DETAIL");
       },
       //编辑打开
       editOpen(row){
+        let lockData = {
+          moduleName: 'xx',
+          tableName: 'finance_settlement',
+          billId: row.id,
+          no: localStorage.getItem('browserID'),
+          billNo:row.srcOrderno
+        }
+
         this.detailData = {
-          id: row.id
+          id: row.id,
+          view:true,
+          lockData:lockData
         };
         this.show = false;
         this.$store.commit("INCOME_IN_DETAIL");

src/views/financialManagement/incomeInvoice/incomeInvoiceDetailsPage.vue

@@ -6,13 +6,20 @@
                    @click="backToList">返回列表
         </el-button>
         <div class="upper_right_button">
+          <el-button type="primary"
+                     size="small"
+                     v-if="viewDisabled"
+                     class="el-button--small-yh"
+                     :loading="buttonLoading"
+                     @click.stop="openEdit()">编辑
+          </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
                      size="small"
                      :loading="buttonLoading"
-                     :disabled="!form.id"
+                     :disabled="!form.id || viewDisabled"
                      @click.stop="makeInvoice"
-          >{{viewDisabled?'撤销开票':'确认开票'}}
+          >{{cancelDisabled?'撤销开票':'确认开票'}}
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
@@ -39,7 +46,7 @@
             <crop-select
               v-model="form.corpId"
               corpType="KG"
-              :disabled="viewDisabled"
+              :disabled="cancelDisabled || viewDisabled"
               @getCorpData="returnBack"
               style="width: 100%"
             ></crop-select>
@@ -48,7 +55,7 @@
             <el-select v-model="form.accountNo"
                        placeholder="请选择"
                        @change="accountNoChange"
-                       :disabled="viewDisabled"
+                       :disabled="cancelDisabled || viewDisabled"
                        clearable
                        filterable>
               <el-option v-for="(item,index) in form.bankList"
@@ -76,13 +83,13 @@
                        size="small"
                        :loading="buttonLoading"
                        icon="el-icon-shopping-cart-2"
-                       :disabled="viewDisabled"
+                       :disabled="cancelDisabled || viewDisabled"
                        @click="selectPurchase">选择采购合同
             </el-button>
             <el-button type="warning"
                        size="small"
                        :loading="buttonLoading"
-                       :disabled="selectionList.length === 0 || viewDisabled"
+                       :disabled="selectionList.length === 0 || cancelDisabled || viewDisabled"
                        @click="generate">生成开票
             </el-button>
           </template>
@@ -91,7 +98,7 @@
               type="text"
               size="small"
               icon="el-icon-edit"
-              :disabled="viewDisabled"
+              :disabled="cancelDisabled || viewDisabled"
               @click.stop="rowCell(scope.row,scope.index)"
             > {{ scope.row.$cellEdit ? '修改完成' : '修改' }}
             </el-button>
@@ -99,7 +106,7 @@
               type="text"
               size="small"
               icon="el-icon-delete"
-              :disabled="viewDisabled"
+              :disabled="cancelDisabled || viewDisabled"
               @click.stop="rowDel(scope.row,scope.index)"
             >删除
             </el-button>
@@ -119,6 +126,7 @@
               placeholder="请输入"
               @change="amountChange"
               size="small"
+              @input="thisAmountVerify(row)"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
             ></el-input>
             <span v-else>{{ row.thisAmount }}</span>
@@ -134,6 +142,7 @@
             <el-input type="textarea"
                       v-model="form.remark"
                       size="small"
+                      :disabled="viewDisabled"
                       rows="2"
                       autocomplete="off"
                       placeholder="">
@@ -155,6 +164,7 @@
             <el-button type="primary"
                        size="small"
                        :loading="buttonLoading"
+                       :disabled="viewDisabled"
                        icon="el-icon-plus"
                        @click="cellAdd">录入
             </el-button>
@@ -164,6 +174,7 @@
               type="text"
               size="small"
               icon="el-icon-edit"
+              :disabled="viewDisabled"
               @click.stop="rowCells(scope.row,scope.index)"
             > {{ scope.row.$cellEdit ? '修改完成' : '修改' }}
             </el-button>
@@ -171,10 +182,43 @@
               type="text"
               size="small"
               icon="el-icon-delete"
+              :disabled="viewDisabled"
               @click.stop="rowDels(scope.row,scope.index)"
             >删除
             </el-button>
           </template>
+          <template slot-scope="{row,index}" slot="serverName">
+            <span v-if="row.$cellEdit" class="required_fields">*</span>
+            <breakdown-select
+              v-if="row.$cellEdit"
+              v-model="row.serverName"
+              style="width: 90%"
+              :configuration="configuration">
+            </breakdown-select>
+            <span v-else>{{ row.serverName }}</span>
+          </template>
+          <template slot="typeno" slot-scope="{ row, index }">
+            <span v-if="row.$cellEdit" class="required_fields">*</span>
+            <el-select
+              v-if="row.$cellEdit"
+              v-model="row.typeno"
+              size="small"
+              style="width:90% !important;"
+              filterable
+              allow-create
+              default-first-option
+              clearable
+            >
+              <el-option
+                v-for="(item,index) in typenoList"
+                :key="index"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+            <span v-else>{{ row.itemType }}</span>
+          </template>
           <template slot-scope="{row,index}" slot="unit">
             <span v-if="row.$cellEdit" class="required_fields">*</span>
             <el-select  v-if="row.$cellEdit" v-model="row.unit" size="small" placeholder="请选择 单位" style="width: 90%" clearable filterable>
@@ -268,6 +312,7 @@
     data() {
       return {
         show:true,
+        cancelDisabled:false,
         viewDisabled:false,
         form: {},
         option: {
@@ -468,6 +513,7 @@
         dataLists:[],
         itemsForms:{},
 
+        typenoList:['*'],
         configuration: {
           multipleChoices: false,
           multiple: false,
@@ -516,6 +562,12 @@
         })
       }
 
+      if(this.detailData.view){
+        this.viewDisabled = true
+        this.option.disabled = true
+        this.options.disabled = true
+      }
+
       if(this.detailData.params){
         this.buttonLoading = true
         getDetails(this.detailData.params).then(res =>{
@@ -568,6 +620,13 @@
         });
         this.$set(this.form,"amount",thisAmountList.reduce((n,m) => n + m)) //数组内和
       },
+      //本次金额验证
+      thisAmountVerify(row){
+        if(parseFloat(row.thisAmount) > parseFloat(row.amount)){
+          this.$message.warning('本次开票金额不得大于金额!')
+          this.$set(row,'thisAmount','')
+        }
+      },
       //生成开票
       generate(){
         let sum = 0
@@ -579,6 +638,7 @@
           amount:sum
         }
         this.$refs.cruds.rowCellAdd(params);
+        this.activeName = 'second'
         this.show = false
       },
       selectPurchase(){
@@ -599,6 +659,8 @@
           item.accId = item.id;
           item.srcOrderno  = item.accSysNo
           item.billNo  = item.srcBillNo
+          item.thisAmount = item.amount
+          item.$cellEdit = true
           delete item.id;
 
           this.$refs.crud.rowCellAdd(item);
@@ -610,7 +672,7 @@
         done(row);
       },
       cellAdd(){
-        this.$refs.cruds.rowCellAdd();
+        this.$refs.cruds.rowCellAdd({typeno : '*'});
       },
       rowCell(row,index){
         this.$refs.crud.rowCell(row, index)
@@ -644,7 +706,7 @@
       },
       makeInvoice(){
         if(this.verificationData()){
-          this.$confirm(this.viewDisabled?"是否撤销开票":"是否确认开票", "提示", {
+          this.$confirm(this.cancelDisabled?"是否撤销开票":"是否确认开票", "提示", {
             confirmButtonText: "确认",
             cancelButtonText: "取消",
             type: "warning",
@@ -678,7 +740,7 @@
               settlementType:2
             }
 
-            if(!this.viewDisabled){
+            if(!this.cancelDisabled){
               //确认开票
               putFund(params).then(res=>{
                 if(res.data.success){
@@ -747,10 +809,10 @@
         this.form = data;
         this.oldForm = Object.assign({},data);
 
-        this.viewDisabled =  data.foundStatus === "核销完成"?true:false;
+        this.cancelDisabled =  data.foundStatus === "核销完成"?true:false;
 
         this.option.column.forEach(item=>{
-          this.$set(item,"disabled",this.viewDisabled)
+          this.$set(item,"disabled",this.cancelDisabled)
         })
 
         if(data.itemsList){
@@ -780,7 +842,26 @@
           return true
         }
       },
+      async openEdit() {
+        //标签页保存key
+        this.inDetailsKey(this.$route.name,this.detailData.lockData);
+        //单据是否锁定
+        if(!await this.checkLocks(this.detailData.lockData)){
+          this.onLock(this.detailData.lockData); //上锁
+          this.viewDisabled = false
+          this.option = this.$options.data().option;
+          this.options = this.$options.data().options;
+        }else{
+          this.$message.warning('此单据已被锁定,请稍后再进行操作!')
+        }
+      },
       backToList() {
+        //编辑按钮存在 或者为新单  新单是没有lockData的
+        if(this.viewDisabled || !this.detailData.lockData){
+          this.$emit("goBack");
+          return
+        }
+
         if(contrastObj(this.form,this.oldForm) || contrastList(this.dataList,this.oldDataList)
         ){
           this.$confirm("是否保存当前页面？", "提示", {
@@ -791,9 +872,18 @@
             this.saveSettlement()
           }).catch(()=>{
             this.$emit("goBack");
+          }).finally(()=>{
+            if(this.form.id){
+              this.unLock(this.detailData.lockData);
+              this.leaveDetailsKey(this.$route.name);
+            }
           })
         }else{
           this.$emit("goBack");
+          if(this.form.id){
+            this.unLock(this.detailData.lockData);
+            this.leaveDetailsKey(this.$route.name);
+          }
         }
       },
     }

src/views/financialManagement/outputInvoice/configuration/invoicepage.json

@@ -36,7 +36,6 @@
       "label": "费用项目",
       "prop": "serverName",
       "overHidden": true,
-      "cell": true,
       "width": 200,
       "index": 4,
       "rules": [
@@ -51,7 +50,6 @@
       "label": "规格型号",
       "prop": "typeno",
       "overHidden": true,
-      "cell": true,
       "width": 150,
       "index": 7,
       "rules": [

src/views/financialManagement/outputInvoice/configuration/mainList.json

@@ -39,11 +39,6 @@
       "label": "往来单位",
       "prop": "corpId",
       "search": true,
-      "hide": true
-    },
-    {
-      "label": "往来单位",
-      "prop": "corpName",
       "overHidden": true,
       "width": 200,
       "index": 4
@@ -110,11 +105,43 @@
       "index": 8
     },
     {
+      "label": "创建人",
+      "prop": "createUserName",
+      "overHidden": true,
+      "index": 9,
+      "width":100
+    },
+    {
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 10,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
+      "overHidden": true,
+      "index": 11,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 12,
+      "width":160
+    },
+    {
       "label": "备注",
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 12,
+      "index": 13,
       "width": 230
     }
   ]

src/views/financialManagement/outputInvoice/outputInvoice.vue

@@ -41,7 +41,7 @@
       <template slot-scope="scope" slot="srcOrderno">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno }}</span>
       </template>
-      <template slot-scope="scope" slot="corpName">
+      <template slot-scope="scope" slot="corpId">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
       </template>
     </avue-crud>
@@ -116,16 +116,25 @@
       //新单打开
       addReceipt(row){
         this.detailData = {
-          id: row.id,
-          status: 1
+          id: row.id
         };
         this.show = false;
         this.$store.commit("OUTPUT_IN_DETAIL");
       },
       //编辑打开
       editOpen(row){
+        let lockData = {
+          moduleName: 'xx',
+          tableName: 'finance_settlement',
+          billId: row.id,
+          no: localStorage.getItem('browserID'),
+          billNo:row.srcOrderno
+        }
+
         this.detailData = {
-          id: row.id
+          id: row.id,
+          view:true,
+          lockData:lockData
         };
         this.show = false;
         this.$store.commit("OUTPUT_IN_DETAIL");

src/views/financialManagement/outputInvoice/outputInvoiceDetailsPage.vue

@@ -6,17 +6,25 @@
                    @click="backToList">返回列表
         </el-button>
         <div class="upper_right_button">
+          <el-button type="primary"
+                     size="small"
+                     v-if="viewDisabled"
+                     class="el-button--small-yh"
+                     :loading="buttonLoading"
+                     @click.stop="openEdit()">编辑
+          </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
                      size="small"
                      :loading="buttonLoading"
-                     :disabled="!form.id"
+                     :disabled="!form.id || viewDisabled"
                      @click.stop="makeInvoice"
-          >{{viewDisabled?'撤销开票':'确认开票'}}
+          >{{cancelDisabled?'撤销开票':'确认开票'}}
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
                      size="small"
+                     :disabled="viewDisabled"
                      :loading="buttonLoading"
                      @click.stop="saveSettlement"
           >保存数据
@@ -30,7 +38,6 @@
       <el-tab-pane label="开票信息" name="second" :key="'second'">
       </el-tab-pane>
     </el-tabs>
-
     <div class="customer-main" style="margin-top: 1px" v-show="show">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
@@ -39,7 +46,7 @@
             <crop-select
               v-model="form.corpId"
               corpType="KG"
-              :disabled="viewDisabled"
+              :disabled="cancelDisabled || viewDisabled"
               @getCorpData="returnBack"
               style="width: 100%"
             ></crop-select>
@@ -48,7 +55,7 @@
             <el-select v-model="form.accountNo"
                        placeholder="请选择"
                        @change="accountNoChange"
-                       :disabled="viewDisabled"
+                       :disabled="cancelDisabled  || viewDisabled"
                        clearable
                        filterable>
               <el-option v-for="(item,index) in form.bankList"
@@ -76,13 +83,13 @@
                        size="small"
                        :loading="buttonLoading"
                        icon="el-icon-shopping-cart-2"
-                       :disabled="viewDisabled"
+                       :disabled="cancelDisabled || viewDisabled"
                        @click="selectPurchase">选择销售合同
             </el-button>
             <el-button type="warning"
                        size="small"
                        :loading="buttonLoading"
-                       :disabled="selectionList.length === 0 || viewDisabled"
+                       :disabled="selectionList.length === 0 || cancelDisabled || viewDisabled"
                        @click="generate">生成开票
             </el-button>
           </template>
@@ -91,7 +98,7 @@
               type="text"
               size="small"
               icon="el-icon-edit"
-              :disabled="viewDisabled"
+              :disabled="cancelDisabled || viewDisabled"
               @click.stop="rowCell(scope.row,scope.index)"
             > {{ scope.row.$cellEdit ? '修改完成' : '修改' }}
             </el-button>
@@ -99,7 +106,7 @@
               type="text"
               size="small"
               icon="el-icon-delete"
-              :disabled="viewDisabled"
+              :disabled="cancelDisabled || viewDisabled"
               @click.stop="rowDel(scope.row,scope.index)"
             >删除
             </el-button>
@@ -119,6 +126,7 @@
               placeholder="请输入"
               size="small"
               @change="amountChange"
+              @input="thisAmountVerify(row)"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
             ></el-input>
             <span v-else>{{ row.thisAmount }}</span>
@@ -133,6 +141,7 @@
           <template slot="remark">
             <el-input type="textarea"
                       v-model="form.remark"
+                      :disabled="viewDisabled"
                       size="small"
                       rows="2"
                       autocomplete="off"
@@ -155,6 +164,7 @@
             <el-button type="primary"
                        size="small"
                        :loading="buttonLoading"
+                       :disabled="viewDisabled"
                        icon="el-icon-plus"
                        @click="cellAdd">录入
             </el-button>
@@ -164,6 +174,7 @@
               type="text"
               size="small"
               icon="el-icon-edit"
+              :disabled="viewDisabled"
               @click.stop="rowCells(scope.row,scope.index)"
             > {{ scope.row.$cellEdit ? '修改完成' : '修改' }}
             </el-button>
@@ -171,10 +182,43 @@
               type="text"
               size="small"
               icon="el-icon-delete"
+              :disabled="viewDisabled"
               @click.stop="rowDels(scope.row,scope.index)"
             >删除
             </el-button>
           </template>
+          <template slot-scope="{row,index}" slot="serverName">
+            <span v-if="row.$cellEdit" class="required_fields">*</span>
+            <breakdown-select
+              v-if="row.$cellEdit"
+              v-model="row.serverName"
+              style="width: 90%"
+              :configuration="configuration">
+            </breakdown-select>
+            <span v-else>{{ row.serverName }}</span>
+          </template>
+          <template slot="typeno" slot-scope="{ row, index }">
+            <span v-if="row.$cellEdit" class="required_fields">*</span>
+            <el-select
+              v-if="row.$cellEdit"
+              v-model="row.typeno"
+              size="small"
+              style="width:90% !important;"
+              filterable
+              allow-create
+              default-first-option
+              clearable
+            >
+              <el-option
+                v-for="(item,index) in typenoList"
+                :key="index"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+            <span v-else>{{ row.itemType }}</span>
+          </template>
           <template slot-scope="{row,index}" slot="unit">
             <span v-if="row.$cellEdit" class="required_fields">*</span>
             <el-select  v-if="row.$cellEdit" v-model="row.unit" size="small" placeholder="请选择 单位" style="width: 90%" clearable filterable>
@@ -269,6 +313,7 @@
       return {
         show:true,
         viewDisabled:false,
+        cancelDisabled:false, //核销状态
         form: {},
         option: {
           menuBtn: false,
@@ -480,6 +525,7 @@
         dataLists:[],
         itemsForms:{},
 
+        typenoList:['*'],
         configuration: {
           multipleChoices: false,
           multiple: false,
@@ -528,6 +574,12 @@
         })
       }
 
+      if(this.detailData.view){
+        this.viewDisabled = true
+        this.option.disabled = true
+        this.options.disabled = true
+      }
+
       if(this.detailData.params){
         this.buttonLoading = true
         getDetails(this.detailData.params).then(res =>{
@@ -571,6 +623,13 @@
         });
         this.$set(this.form,"amount",thisAmountList.reduce((n,m) => n + m)) //数组内和
       },
+      //本次金额验证
+      thisAmountVerify(row){
+        if(parseFloat(row.thisAmount) > parseFloat(row.amount)){
+          this.$message.warning('本次开票金额不得大于金额!')
+          this.$set(row,'thisAmount','')
+        }
+      },
       //选择卡号
       accountNoChange(value){
         this.form.bankList.forEach(item =>{
@@ -591,6 +650,7 @@
           amount:sum
         }
         this.$refs.cruds.rowCellAdd(params);
+        this.activeName = 'second'
         this.show = false
       },
       selectPurchase(){
@@ -611,10 +671,14 @@
           item.accId = item.id;
           item.srcOrderno  = item.accSysNo
           item.billNo  = item.srcBillNo
+          item.thisAmount = item.amount
+          item.$cellEdit = true
           delete item.id;
 
-          this.$refs.crud.rowCellAdd(item);
+          this.dataList.push(item)
+          // this.$refs.crud.rowCellAdd(item);
         })
+        //合同号去重加逗号
         this.$set(this.form,'srcOrderno',Array.from(new Set(this.dataList.map(item =>{ if(item.srcOrderno){return item.srcOrderno}}))).join(','))
         this.billDetailDialog = false;
       },
@@ -622,10 +686,13 @@
         done(row);
       },
       cellAdd(){
-        this.$refs.cruds.rowCellAdd();
+        this.$refs.cruds.rowCellAdd({typeno : '*'});
       },
       rowCell(row,index){
-        this.$refs.crud.rowCell(row, index)
+        // row.$cellEdit = !row.$cellEdit
+        this.$set(row,'$cellEdit',!row.$cellEdit)
+        // this.$refs.crud.rowCell(row, index)
+        console.log(row.$cellEdit)
       },
       rowDel(row,index){
         this.$confirm("确定将选择数据删除?", {
@@ -656,7 +723,7 @@
       },
       makeInvoice(){
         if(this.verificationData()){
-          this.$confirm(this.viewDisabled?"是否撤销开票":"是否确认开票", "提示", {
+          this.$confirm(this.cancelDisabled?"是否撤销开票":"是否确认开票", "提示", {
             confirmButtonText: "确认",
             cancelButtonText: "取消",
             type: "warning",
@@ -690,7 +757,7 @@
               settlementType:2
             }
 
-            if(!this.viewDisabled){
+            if(!this.cancelDisabled){
               //确认开票
               putFund(params).then(res=>{
                 if(res.data.success){
@@ -759,10 +826,10 @@
         this.form = data;
         this.oldForm = Object.assign({},data);
 
-        this.viewDisabled =  data.foundStatus === "核销完成"?true:false;
+        this.cancelDisabled =  data.foundStatus === "核销完成"?true:false;
 
         this.option.column.forEach(item=>{
-          this.$set(item,"disabled",this.viewDisabled)
+          this.$set(item,"disabled",this.cancelDisabled)
         })
 
         if(data.itemsList){
@@ -774,6 +841,19 @@
           this.oldDataLists = this.deepClone(data.invoiceItemList)
         }
       },
+      async openEdit() {
+        //标签页保存key
+        this.inDetailsKey(this.$route.name,this.detailData.lockData);
+        //单据是否锁定
+        if(!await this.checkLocks(this.detailData.lockData)){
+          this.onLock(this.detailData.lockData); //上锁
+          this.viewDisabled = false
+          this.option = this.$options.data().option;
+          this.options = this.$options.data().options;
+        }else{
+          this.$message.warning('此单据已被锁定,请稍后再进行操作!')
+        }
+      },
       verificationData(){
         if(contrastObj(this.form,this.oldForm)
           || contrastList(this.dataList,this.oldDataList)
@@ -793,6 +873,12 @@
         }
       },
       backToList() {
+        //编辑按钮存在 或者为新单  新单是没有lockData的
+        if(this.viewDisabled || !this.detailData.lockData){
+          this.$emit("goBack");
+          return
+        }
+
         if(contrastObj(this.form,this.oldForm) || contrastList(this.dataList,this.oldDataList)
         ){
           this.$confirm("是否保存当前页面？", "提示", {
@@ -803,9 +889,18 @@
             this.saveSettlement()
           }).catch(()=>{
             this.$emit("goBack");
+          }).finally(()=>{
+            if(this.form.id){
+              this.unLock(this.detailData.lockData);
+              this.leaveDetailsKey(this.$route.name);
+            }
           })
         }else{
           this.$emit("goBack");
+          if(this.form.id){
+            this.unLock(this.detailData.lockData);
+            this.leaveDetailsKey(this.$route.name);
+          }
         }
       },
     }

src/views/financialManagement/paymentRequest/configuration/detailsPage.json

@@ -57,14 +57,6 @@
       "overHidden": true
     },
     {
-      "label": "数量",
-      "prop": "quantity",
-      "hide": true,
-      "index": 4,
-      "width":120,
-      "overHidden": true
-    },
-    {
       "label": "单价",
       "prop": "price",
       "width":120,

src/views/financialManagement/paymentRequest/configuration/mainList.json

@@ -56,11 +56,6 @@
       "prop": "corpId",
       "search": true,
       "searchOrder": 3,
-      "hide": true
-    },
-    {
-      "label": "客户名称",
-      "prop": "corpName",
       "overHidden": true,
       "width": 180,
       "index": 3
@@ -136,24 +131,38 @@
       "index": 7
     },
     {
-      "label": "申请日期",
+      "label": "创建人",
+      "prop": "createUserName",
+      "overHidden": true,
+      "index": 8,
+      "width":100
+    },
+    {
+      "label": "创建日期",
       "prop": "createTime",
       "type": "date",
       "search": true,
-      "unlinkPanels": true,
       "searchRange": true,
+      "unlinkPanels": true,
       "overHidden": true,
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "width": 150,
-      "index": 8
+      "index": 9,
+      "width":160
     },
     {
-      "label": "申请人",
+      "label": "修改人",
+      "prop": "updateUserName",
       "overHidden": true,
-      "prop": "createUserName",
-      "index": 9,
-      "width": 120
+      "index": 10,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 11,
+      "width":160
     },
     {
       "label": "备注",

src/views/financialManagement/paymentRequest/index.vue

@@ -42,7 +42,7 @@
       <template slot-scope="scope" slot="srcOrderno">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno }}</span>
       </template>
-      <template slot-scope="scope" slot="corpName">
+      <template slot-scope="scope" slot="corpId">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
       </template>
     </avue-crud>
@@ -106,8 +106,8 @@
         }
         if(this.$route.query.params  && this.show){
           let lockData = {
-            moduleName: 'sq',
-            tableName: 'business_order',
+            moduleName: 'ffsq',
+            tableName: 'finance_settlement',
             billId: this.$route.query.params,
             no: localStorage.getItem('browserID'),
             billNo:""

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -446,6 +446,7 @@
       this.getWorkDicts("currency").then(res =>{
         this.currencyDic = res.data.data
       })
+
       if(this.detailData.view){
         this.viewDisabled = true
         this.option.disabled = true
@@ -460,6 +461,7 @@
           this.buttonLoading = false
         })
       }
+
       if(this.detailData.check){
         //待审批状态才可选择通过或者驳回
         if(this.detailData.check.auditStatus === "S"){

src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -51,11 +51,6 @@
       "label": "往来单位",
       "prop": "corpId",
       "search": true,
-      "hide": true
-    },
-    {
-      "label": "客户名称",
-      "prop": "corpName",
       "overHidden": true,
       "width": 200,
       "index": 4
@@ -128,28 +123,43 @@
       "index": 9
     },
     {
-      "label": "申请人",
+      "label": "创建人",
       "prop": "createUserName",
       "overHidden": true,
       "index": 10,
-      "width": 120
+      "width":100
     },
     {
-      "label": "申请日期",
+      "label": "创建日期",
       "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 11,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
       "overHidden": true,
+      "index": 12,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
       "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "width": 150,
-      "index": 11
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 13,
+      "width":160
     },
     {
       "label": "备注",
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 12,
+      "index": 14,
       "width": 120
     }
   ]

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -46,7 +46,7 @@
       <template slot-scope="scope" slot="srcOrderno">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno }}</span>
       </template>
-      <template slot-scope="scope" slot="corpName">
+      <template slot-scope="scope" slot="corpId">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
       </template>
     </avue-crud>

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -131,6 +131,7 @@
               style="width: 90%"
               placeholder="请输入"
               size="small"
+              @input="thisAmountVerify(row)"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
             ></el-input>
             <span v-else>{{ row.thisAmount }}</span>
@@ -500,6 +501,13 @@
           }
         })
       },
+      //本次金额验证
+      thisAmountVerify(row){
+        if(parseFloat(row.thisAmount) > parseFloat(row.amount)){
+          this.$message.warning('本次金额不得大于金额!')
+          this.$set(row,'thisAmount','')
+        }
+      },
       selectPurchase(){
         if(!this.form.corpId){
           this.$message.warning("请先选择客户!")
@@ -518,6 +526,7 @@
           item.accId = item.id;
           item.srcOrderno  = item.accSysNo
           item.billNo  = item.srcBillNo
+          item.thisAmount = item.amount
           delete item.id;
 
           this.$refs.crud.rowCellAdd(item);

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -51,11 +51,6 @@
       "label": "往来单位",
       "prop": "corpId",
       "search": true,
-      "hide": true
-    },
-    {
-      "label": "客户名称",
-      "prop": "corpName",
       "overHidden": true,
       "width": 200,
       "index": 4
@@ -128,28 +123,43 @@
       "index": 9
     },
     {
-      "label": "申请人",
+      "label": "创建人",
       "prop": "createUserName",
       "overHidden": true,
       "index": 10,
-      "width": 120
+      "width":100
     },
     {
-      "label": "申请日期",
+      "label": "创建日期",
       "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 11,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
       "overHidden": true,
+      "index": 12,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
       "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "width": 150,
-      "index": 11
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 13,
+      "width":160
     },
     {
       "label": "备注",
       "prop": "remark",
       "search": true,
       "overHidden": true,
-      "index": 12,
+      "index": 14,
       "width": 120
     }
   ]

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -46,7 +46,7 @@
       <template slot-scope="scope" slot="srcOrderno">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno }}</span>
       </template>
-      <template slot-scope="scope" slot="corpName">
+      <template slot-scope="scope" slot="corpId">
         <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
       </template>
     </avue-crud>

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -131,6 +131,7 @@
               style="width: 90%"
               placeholder="请输入"
               size="small"
+              @input="thisAmountVerify(row)"
               oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
             ></el-input>
             <span v-else>{{ row.thisAmount }}</span>
@@ -496,6 +497,13 @@
           }
         })
       },
+      //本次金额验证
+      thisAmountVerify(row){
+        if(parseFloat(row.thisAmount) > parseFloat(row.amount)){
+          this.$message.warning('本次金额不得大于金额!')
+          this.$set(row,'thisAmount','')
+        }
+      },
       selectRecipt(){
         if(!this.form.corpId){
           this.$message.warning("请先选择客户!")
@@ -514,6 +522,7 @@
           item.accId = item.id;
           item.srcOrderno  = item.accSysNo
           item.billNo  = item.srcBillNo
+          item.thisAmount = item.amount
           delete item.id;
           this.$refs.crud.rowCellAdd(item);
         })

src/views/importTrade/invoice/config/customerContact.json

@@ -161,6 +161,38 @@
           "trigger": "blur"
         }
       ]
+    },
+    {
+      "label": "创建人",
+      "prop": "createUserName",
+      "overHidden": true,
+      "index": 13,
+      "width":100
+    },
+    {
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 14,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
+      "overHidden": true,
+      "index": 15,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 16,
+      "width":160
     }
   ]
 }

src/views/importTrade/invoice/config/mainList.json

@@ -45,16 +45,11 @@
     {
       "label": "供应商",
       "prop": "corpId",
-      "hide": true,
       "search": true,
-      "searchOrder": 1
-    },
-    {
-      "label": "供应商",
-      "prop": "corpsName",
       "overHidden": true,
       "index": 1,
-      "width":200
+      "width":200,
+      "searchOrder": 1
     },
     {
       "label": "合同号",
@@ -140,13 +135,7 @@
       "label": "仓库",
       "prop": "storageId",
       "search": true,
-      "hide": true,
       "searchOrder": 8,
-      "width":150
-    },
-    {
-      "label": "仓库",
-      "prop": "storageName",
       "overHidden": true,
       "index": 11,
       "width":150
@@ -161,33 +150,47 @@
       "width":180
     },
     {
-      "label": "系统编号",
-      "prop": "sysNo",
+      "label": "创建人",
+      "prop": "createUserName",
       "overHidden": true,
+      "search": true,
+      "searchOrder": 9,
       "index": 13,
-      "width":120
+      "width":100
     },
     {
-      "label": "制单人",
-      "prop": "createUserName",
-      "overHidden": true,
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
       "search": true,
+      "searchRange": true,
+      "unlinkPanels": true,
+      "overHidden": true,
       "searchOrder": 10,
       "index": 14,
-      "width":120
+      "width":160
     },
     {
-      "label": "制单人日期",
-      "prop": "createTime",
+      "label": "修改人",
+      "prop": "updateUserName",
       "overHidden": true,
-      "search": true,
-      "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "unlinkPanels": true,
-      "searchRange": true,
-      "searchOrder": 9,
       "index": 15,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 16,
+      "width":160
+    },
+    {
+      "label": "系统编号",
+      "prop": "sysNo",
+      "overHidden": true,
+      "index": 17,
       "width":120
     }
   ]

src/views/importTrade/invoice/index.vue

@@ -51,9 +51,12 @@
       <template slot-scope="scope" slot="orderNo">
         <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.orderNo }}</span>
       </template>
-      <template slot-scope="scope" slot="corpsName">
+      <template slot-scope="scope" slot="corpId">
         <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.corpsName }}</span>
       </template>
+      <template slot-scope="scope" slot="storageId">
+        <span>{{ scope.row.storageName }}</span>
+      </template>
       <template slot-scope="scope" slot="totalQuantity">
         <span>{{ scope.row.totalQuantity | roundNumbers}}</span>
       </template>

src/views/importTrade/receipt/config/customerContact.json

@@ -90,21 +90,6 @@
       "index": 4,
       "width":120
     },
-    {
-      "label": "库存件数",
-      "prop": "inventoryNumber",
-      "overHidden": true,
-      "hide": true,
-      "width":120
-    },
-    {
-      "label": "库存重量(吨)",
-      "prop": "inWeight",
-      "overHidden": true,
-      "hide": true,
-      "index": 5,
-      "width":120
-    },
    {
       "label": "件数",
       "prop": "actualQuantity",
@@ -173,7 +158,7 @@
       "prop": "remarks",
       "overHidden": true,
       "index": 11,
-      "width":280,
+      "width":180,
       "cell": true,
       "rules": [
         {
@@ -182,6 +167,38 @@
           "trigger": "blur"
         }
       ]
+    },
+    {
+      "label": "创建人",
+      "prop": "createUserName",
+      "overHidden": true,
+      "index": 12,
+      "width":100
+    },
+    {
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 13,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
+      "overHidden": true,
+      "index": 14,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 15,
+      "width":160
     }
   ]
 }

src/views/importTrade/receipt/config/mainList.json

@@ -47,11 +47,6 @@
       "prop": "corpId",
       "search": true,
       "searchOrder": 1,
-      "hide": true
-    },
-    {
-      "label": "供应商",
-      "prop": "corpsName",
       "overHidden": true,
       "index": 1,
       "width":120
@@ -140,13 +135,7 @@
       "label": "仓库",
       "prop": "storageId",
       "search": true,
-      "hide": true,
       "searchOrder": 8,
-      "width":150
-    },
-    {
-      "label": "仓库",
-      "prop": "storageName",
       "overHidden": true,
       "index": 11,
       "width":150
@@ -161,33 +150,47 @@
       "width":180
     },
     {
-      "label": "系统编号",
-      "prop": "sysNo",
+      "label": "创建人",
+      "prop": "createUserName",
       "overHidden": true,
-      "index": 13,
-      "width":120
+      "search": true,
+      "searchOrder": 9,
+      "index": 19,
+      "width":100
     },
     {
-      "label": "制单人日期",
+      "label": "创建日期",
       "prop": "createTime",
-      "search": true,
       "type": "date",
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "unlinkPanels": true,
+      "search": true,
       "searchRange": true,
+      "unlinkPanels": true,
       "overHidden": true,
-      "searchOrder": 9,
-      "index": 14,
-      "width":120
+      "searchOrder": 10,
+      "index": 20,
+      "width":160
     },
     {
-      "label": "制单人",
-      "prop": "createUserName",
-      "search": true,
+      "label": "修改人",
+      "prop": "updateUserName",
       "overHidden": true,
-      "searchOrder": 10,
-      "index": 15,
+      "index": 21,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 22,
+      "width":160
+    },
+    {
+      "label": "系统编号",
+      "prop": "sysNo",
+      "overHidden": true,
+      "index": 13,
       "width":120
     }
   ]

src/views/importTrade/receipt/index.vue

@@ -51,9 +51,12 @@
       <template slot-scope="scope" slot="orderNo">
         <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
       </template>
-      <template slot-scope="scope" slot="corpsName">
+      <template slot-scope="scope" slot="corpId">
         <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
       </template>
+      <template slot-scope="scope" slot="storageId">
+        <span>{{ scope.row.storageName }}</span>
+      </template>
       <template slot-scope="scope" slot="totalQuantity">
         <span>{{ scope.row.totalQuantity | roundNumbers}}</span>
       </template>

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

@@ -205,6 +205,38 @@
           "trigger": "blur"
         }
       ]
+    },
+    {
+      "label": "创建人",
+      "prop": "createUserName",
+      "overHidden": true,
+      "index": 14,
+      "width":100
+    },
+    {
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 15,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
+      "overHidden": true,
+      "index": 16,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 17,
+      "width":160
     }
   ]
 }

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

@@ -91,16 +91,11 @@
     },
     {
       "label": "供应商",
-      "prop": "strCorpName",
-      "overHidden": true,
-      "index": 3,
-      "width":200
-    },
-    {
-      "label": "供应商",
       "prop": "corpId",
       "search": true,
-      "hide": true,
+      "overHidden": true,
+      "index": 3,
+      "width":200,
       "searchOrder": 3
     },
     {
@@ -247,11 +242,43 @@
       "width":150
     },
     {
+      "label": "创建人",
+      "prop": "createUserName",
+      "overHidden": true,
+      "index": 19,
+      "width":100
+    },
+    {
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 20,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
+      "overHidden": true,
+      "index": 21,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 22,
+      "width":160
+    },
+    {
       "label": "备注",
       "prop": "orderRemark",
       "overHidden": true,
       "searchOrder": 12,
-      "index": 19,
+      "index": 23,
       "width":200
     }
   ]

src/views/purchase/contract/detailsPage.vue

@@ -19,7 +19,7 @@
             type="primary"
             size="small"
             :loading="buttonLoading"
-            :disabled="!form.id || checkDisabled || viewDisabled"
+            :disabled="!form.id || viewDisabled"
           >
             审批处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
@@ -34,7 +34,7 @@
           <el-button
             type="warning"
             :loading="buttonLoading"
-            :disabled="!form.id || checkDisabled || viewDisabled"
+            :disabled="!form.id || viewDisabled"
             size="small"
           >
             账单处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -56,7 +56,7 @@
           <el-button
             type="success"
             :loading="buttonLoading"
-            :disabled="!form.id || checkDisabled || viewDisabled"
+            :disabled="!form.id || viewDisabled"
             size="small"
           >
             业务处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -75,7 +75,7 @@
           class="el-button--small-yh "
           type="primary"
           size="small"
-          :disabled="disabled  || checkDisabled || viewDisabled"
+          :disabled="disabled  || viewDisabled"
           @click="editCustomer"
           :loading="buttonLoading"
         >保存数据
@@ -492,7 +492,6 @@ export default {
       commodityData: false,
       takeDisabled:false, //收货状态
       viewDisabled:false,//查看状态
-      checkDisabled:false,
       approverDisabled:false,//审批
       tableData: [],
       batchNo:'',
@@ -824,7 +823,6 @@ export default {
 
     if(this.detailData.view){
       this.viewDisabled = true
-      this.checkDisabled = true
     }
 
     if (this.detailData.id) {
@@ -1279,7 +1277,6 @@ export default {
       if(!await this.checkLocks(this.detailData.lockData)){
         this.onLock(this.detailData.lockData); //上锁
         this.viewDisabled = false
-        this.checkDisabled = false
       }else{
         this.$message.warning('此单据已被锁定,请稍后再进行操作!')
       }

src/views/purchase/contract/index.vue

@@ -59,12 +59,12 @@
           >删除
           </el-button>
         </template>
+        <template slot-scope="scope" slot="corpId">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.strCorpName }}</span>
+        </template>
         <template slot-scope="scope" slot="orderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.orderNo }}</span>
         </template>
-        <template slot-scope="scope" slot="strCorpName">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.strCorpName }}</span>
-        </template>
         <template slot-scope="scope" slot="orderQuantity">
           <span>{{ scope.row.orderQuantity | roundNumbers}}</span>
         </template>

src/views/salesManagement/salesContract/config/importInventory.json

@@ -214,11 +214,36 @@
       ]
     },
     {
-      "label": "itemId",
-      "prop": "itemId",
+      "label": "创建人",
+      "prop": "createUserName",
       "overHidden": true,
-      "width":200,
-      "hide": true
+      "index": 14,
+      "width":100
+    },
+    {
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 15,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
+      "overHidden": true,
+      "index": 16,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 17,
+      "width":160
     }
   ]
 }

src/views/salesManagement/salesContract/config/mainList.json

@@ -86,19 +86,14 @@
     },
     {
       "label": "客户名称",
-      "prop": "corpsName",
+      "prop": "corpId",
+      "search": true,
+      "searchOrder": 3,
       "overHidden": true,
       "index": 3,
       "width":150
     },
     {
-      "label": "客户名称",
-      "prop": "corpId",
-      "hide": true,
-      "search": true,
-      "searchOrder": 3
-    },
-    {
       "label": "合同日期",
       "prop": "businesDate",
       "overHidden": true,
@@ -191,13 +186,46 @@
       "searchOrder": 6,
       "index": 14,
       "width":150
-    },{
+    },
+    {
+      "label": "创建人",
+      "prop": "createUserName",
+      "overHidden": true,
+      "index": 15,
+      "width":100
+    },
+    {
+      "label": "创建日期",
+      "prop": "createTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 16,
+      "width":160
+    },
+    {
+      "label": "修改人",
+      "prop": "updateUserName",
+      "overHidden": true,
+      "index": 17,
+      "width":100
+    },
+    {
+      "label": "修改日期",
+      "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 18,
+      "width":160
+    },
+    {
       "label": "备注",
       "prop": "orderRemark",
       "overHidden": true,
       "search": true,
       "searchOrder": 7,
-      "index": 15,
+      "index": 19,
       "width":200
     }
   ]

src/views/salesManagement/salesContract/detailsPage.vue

@@ -20,7 +20,7 @@
             type="primary"
             size="small"
             :loading="buttonLoading"
-            :disabled="!form.id || checkDisabled"
+            :disabled="!form.id || viewDisabled"
           >
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
@@ -35,7 +35,7 @@
           <el-button
             type="warning"
             :loading="buttonLoading"
-            :disabled="!form.id || checkDisabled"
+            :disabled="!form.id || viewDisabled"
             size="small"
           >
             账单处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -57,7 +57,7 @@
           <el-button
             type="success"
             :loading="buttonLoading"
-            :disabled="!form.id || checkDisabled"
+            :disabled="!form.id || viewDisabled"
             size="small"
           >
             业务处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -77,7 +77,7 @@
             class="el-button--small-yh"
             type="primary"
             size="small"
-            :disabled="disabled || checkDisabled"
+            :disabled="disabled || viewDisabled"
             :loading="buttonLoading"
             @click="editCustomer"
           >保存数据
@@ -311,7 +311,7 @@
                 type="text"
                 size="small"
                 icon="el-icon-delete"
-                :disabled="  viewDisabled"
+                :disabled="viewDisabled"
                 @click="rowDelList(row,index)"
               >删除
               </el-button>
@@ -509,7 +509,6 @@ export default {
       applySettlementDialog:false,
       financialAccountDialog:false,
       applicationDialog:false,
-      checkDisabled:false,
       viewDisabled:false,
       takeDisabled:false,
       buttonDisabled:false,
@@ -791,7 +790,6 @@ export default {
     })
     if(this.detailData.view){
       this.viewDisabled = true
-      this.checkDisabled = true
     }
     if (this.detailData.id) {
       this.buttonLoading = true;
@@ -1267,7 +1265,6 @@ export default {
       if(!await this.checkLocks(this.detailData.lockData)){
         this.onLock(this.detailData.lockData); //上锁
         this.viewDisabled = false
-        this.checkDisabled = false
       }else{
         this.$message.warning('此单据已被锁定,请稍后再进行操作!')
       }

src/views/salesManagement/salesContract/index.vue

@@ -62,7 +62,7 @@
       <template slot-scope="scope" slot="orderNo">
         <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.orderNo }}</span>
       </template>
-      <template slot-scope="scope" slot="corpsName">
+      <template slot-scope="scope" slot="corpId">
         <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.corpsName }}</span>
       </template>
       <template slot-scope="scope" slot="orderQuantity">