进口 锁

src/components/finance/config/option.json

@@ -48,6 +48,20 @@
       ]
     },
     {
+      "label": "所属公司",
+      "prop": "belongToCorpId",
+      "overHidden": true,
+      "index": 4,
+      "width": 180,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
       "label": "费用名称",
       "prop": "costType",
       "overHidden": true,

src/components/finance/financialAccount.vue

@@ -45,6 +45,15 @@
             style="width: 100%"
           ></crop-select>
         </template>
+        <template slot-scope="{row,index}" slot="belongToCorpId">
+          <crop-select
+            v-if="row.$cellEdit"
+            v-model="row.belongToCorpId"
+            corpType="GS"
+            style="width: 100%"
+          ></crop-select>
+          <span v-else>{{ row.costType }}</span>
+        </template>
         <template slot-scope="{row,index}" slot="costType">
           <span v-if="row.$cellEdit" class="required_fields">*</span>
           <breakdown-select

src/main.js

@@ -53,6 +53,10 @@ import {
   saveColumnData,
   delColumnData
 } from "@/util/columnSetting"
+//查看是否有锁
+import {
+  checkLocks
+} from "@/util/lock"
 import {
   inDetailsKey,
   leaveDetailsKey
@@ -127,6 +131,7 @@ Vue.prototype.corpAddr = corpAddr;
 Vue.prototype.checkLock = checkLock;
 Vue.prototype.onLock = onLock;
 Vue.prototype.unLock = unLock;
+Vue.prototype.checkLocks = checkLocks;
 new Vue({
   router,
   store,
@@ -249,14 +254,14 @@ Vue.directive("input-limit", {
 })
 Fingerprint2.get(function(components) {
   const values = components.map(function(component,index) {
-    if (index === 0) { 
+    if (index === 0) {
       return component.value.replace(/\bNetType\/\w+\b/, '')
     }
     return component.value
   })
-  // 生成最终id murmur   
+  // 生成最终id murmur
   const murmur = Fingerprint2.x64hash128(values.join(''), 31)
   if(localStorage.getItem('browserID')!=murmur){
     localStorage.setItem('browserID',murmur)
   }
-})
+})

src/util/lock.js

@@ -0,0 +1,15 @@
+import { checkLock } from "@/api/lock/lock"
+
+export async function checkLocks(data) {
+  let option
+   await checkLock(data).then(res => {
+    //此单据未被锁定
+    if(res.data.code === 200){
+      option = false
+    }else{
+      //此单据已被锁定
+      option = true
+    }
+  })
+  return option
+}

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

@@ -67,6 +67,13 @@
       "index": 4
     },
     {
+      "label": "所属公司",
+      "prop": "belongToCorpId",
+      "overHidden": true,
+      "width": 200,
+      "index": 4
+    },
+    {
       "label": "单据来源",
       "prop": "billType",
       "type": "select",

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

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 80,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,
@@ -49,6 +49,28 @@
       "index": 4
     },
     {
+      "label": "银行名称",
+      "prop": "accountBank",
+      "overHidden": true,
+      "width": 150,
+      "index": 4
+    },
+    {
+      "label": "银行户头",
+      "prop": "accountName",
+      "search": true,
+      "overHidden": true,
+      "width": 150,
+      "index": 4
+    },
+    {
+      "label": "银行卡号",
+      "prop": "accountNo",
+      "overHidden": true,
+      "width": 150,
+      "index": 4
+    },
+    {
       "label": "开票抬头",
       "prop": "invoiceTitle",
       "overHidden": true,

src/views/financialManagement/incomeInvoice/incomeInvoice.vue

@@ -33,18 +33,17 @@
         <el-button
           type="text"
           size="small"
-          icon="el-icon-edit"
-          @click.stop="editOpen(scope.row, 2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
           icon="el-icon-delete"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>
       </template>
+      <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">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
+      </template>
     </avue-crud>
   </basic-container>
   <detail-page
@@ -124,10 +123,9 @@
         this.$store.commit("INCOME_IN_DETAIL");
       },
       //编辑打开
-      editOpen(row, status){
+      editOpen(row){
         this.detailData = {
-          id: row.id,
-          status: status
+          id: row.id
         };
         this.show = false;
         this.$store.commit("INCOME_IN_DETAIL");

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

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 80,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,
@@ -49,6 +49,28 @@
       "index": 4
     },
     {
+      "label": "银行名称",
+      "prop": "accountBank",
+      "overHidden": true,
+      "width": 150,
+      "index": 4
+    },
+    {
+      "label": "银行户头",
+      "prop": "accountName",
+      "search": true,
+      "overHidden": true,
+      "width": 150,
+      "index": 4
+    },
+    {
+      "label": "银行卡号",
+      "prop": "accountNo",
+      "overHidden": true,
+      "width": 150,
+      "index": 4
+    },
+    {
       "label": "开票抬头",
       "prop": "invoiceTitle",
       "overHidden": true,

src/views/financialManagement/outputInvoice/outputInvoice.vue

@@ -33,18 +33,17 @@
         <el-button
           type="text"
           size="small"
-          icon="el-icon-edit"
-          @click.stop="editOpen(scope.row, 2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
           icon="el-icon-delete"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>
       </template>
+      <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">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
+      </template>
     </avue-crud>
   </basic-container>
   <detail-page
@@ -124,10 +123,9 @@
         this.$store.commit("OUTPUT_IN_DETAIL");
       },
       //编辑打开
-      editOpen(row, status){
+      editOpen(row){
         this.detailData = {
-          id: row.id,
-          status: status
+          id: row.id
         };
         this.show = false;
         this.$store.commit("OUTPUT_IN_DETAIL");

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

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 80,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,
@@ -66,6 +66,13 @@
       "index": 3
     },
     {
+      "label": "所属公司",
+      "prop": "belongToCorpId",
+      "overHidden": true,
+      "width": 180,
+      "index": 3
+    },
+    {
       "label": "单据状态",
       "prop": "checkStatus",
       "type": "select",

src/views/financialManagement/paymentRequest/index.vue

@@ -33,19 +33,18 @@
         <el-button
           type="text"
           size="small"
-          icon="el-icon-edit"
-          @click.stop="editOpen(scope.row, 2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
           icon="el-icon-delete"
           :disabled="scope.row.checkStatus !== '录入'"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>
       </template>
+      <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">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
+      </template>
     </avue-crud>
   </basic-container>
   <detail-page
@@ -107,7 +106,8 @@
         }
         if(this.$route.query.params  && this.show){
           this.detailData={
-            id:this.$route.query.params
+            id:this.$route.query.params,
+            view:true,
           }
           this.show = false;
           this.$store.commit("PQ_IN_DETAIL");
@@ -131,11 +131,21 @@
         this.$store.commit("PQ_IN_DETAIL");
       },
       //编辑打开
-      editOpen(row, status) {
+      editOpen(row) {
+        let lockData = {
+          moduleName: 'sq',
+          tableName: 'business_order',
+          billId: row.id,
+          no: localStorage.getItem('browserID'),
+          billNo:row.orderNo
+        }
+
         this.detailData = {
           id: row.id,
-          status: status
+          view:true,
+          lockData:lockData
         };
+
         this.show = false;
         this.$store.commit("PQ_IN_DETAIL");
       },

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -6,10 +6,18 @@
                    @click="backToList">返回列表
         </el-button>
         <div v-if="!auditDisabled" 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-dropdown style="padding: 0 8px;line-height: 0">
             <el-button
               type="warning"
+              :disabled="viewDisabled"
               :loading="buttonLoading"
               size="small"
             >
@@ -18,16 +26,16 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
                 :loading="buttonLoading"
-                :disabled="checkDisabled"
+                :disabled="checkDisabled || viewDisabled"
                 @click.native="paymentCheck">{{form.checkStatus == '审批中'?'审批中':'审批提交'}}
               </el-dropdown-item>
               <el-dropdown-item
                 :loading="buttonLoading"
-                :disabled="!checkDisabled"
+                :disabled="!checkDisabled || viewDisabled"
                 @click.native="checkScheduleDialog = true,checkId=form.id">审批进度
               </el-dropdown-item>
               <el-dropdown-item
-                :disabled="!recallDisabled"
+                :disabled="!recallDisabled || viewDisabled"
                 @click.native="cancelAudit">撤销审批
               </el-dropdown-item>
             </el-dropdown-menu>
@@ -36,11 +44,12 @@
                      size="small"
                      :loading="buttonLoading"
                      class="el-button--small-yh"
-                     :disabled="form.checkStatus !== '审批通过'"
+                     :disabled="form.checkStatus !== '审批通过' || viewDisabled"
                      @click.stop="settlement">结算
           </el-button>
           <el-button type="primary"
                      size="small"
+                     :disabled="viewDisabled"
                      :loading="buttonLoading"
                      class="el-button--small-yh"
                      @click.stop="confirmEdit">保存数据
@@ -73,16 +82,24 @@
             <crop-select
               v-model="form.corpId"
               corpType="KG"
-              :disabled="checkDisabled || auditDisabled"
+              :disabled="checkDisabled || auditDisabled || viewDisabled"
               @getCorpData="returnBack"
               style="width: 100%"
             ></crop-select>
           </template>
+          <template slot="belongToCorpId">
+            <crop-select
+              v-model="form.belongToCorpId"
+              corpType="GS"
+              :disabled="checkDisabled || auditDisabled || viewDisabled"
+              style="width: 100%"
+            ></crop-select>
+          </template>
           <template slot="accountNo">
             <el-select v-model="form.accountNo"
                        placeholder="请选择"
                        @change="accountNoChange"
-                       :disabled="checkDisabled || auditDisabled"
+                       :disabled="checkDisabled || auditDisabled || viewDisabled"
                        clearable
                        allow-create
                        default-first-option
@@ -98,6 +115,7 @@
           <template slot="remark">
             <el-input type="textarea"
                       v-model="form.remark"
+                      :disabled="viewDisabled"
                       size="small"
                       rows="2"
                       autocomplete="off"
@@ -126,7 +144,7 @@
               type="text"
               size="small"
               icon="el-icon-edit"
-              :disabled="checkDisabled || auditDisabled"
+              :disabled="checkDisabled || auditDisabled || viewDisabled"
               @click="rowCell(scope.row,scope.index)"
             >{{ scope.row.$cellEdit ? '修改完成' : '修改' }}
             </el-button>
@@ -134,7 +152,7 @@
               type="text"
               size="small"
               icon="el-icon-delete"
-              :disabled="checkDisabled || auditDisabled"
+              :disabled="checkDisabled || auditDisabled || viewDisabled"
               @click.stop="rowDel(scope.row,scope.index)"
             >删除
             </el-button>
@@ -240,6 +258,7 @@
         itemForm: {},
         checkData:{},
         itemOption: itemOption,
+        viewDisabled:false,
         checkDisabled:false,
         auditDisabled:false,
         buttonDisabled:true,
@@ -362,6 +381,19 @@
               ]
             },
             {
+              label: '所属公司',
+              prop: 'belongToCorpId',
+              sort:true,
+              span: 8,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
               label: '申请人',
               prop: 'createUserName',
               span: 8,
@@ -414,6 +446,11 @@
       this.getWorkDicts("currency").then(res =>{
         this.currencyDic = res.data.data
       })
+      if(this.detailData.view){
+        this.viewDisabled = true
+        this.option.disabled = true
+      }
+
       if (this.detailData.id) {
         this.id = this.detailData.id;
         this.buttonLoading = true;
@@ -622,7 +659,26 @@
           this.oldDataList = this.deepClone(data.itemsList)
         }
       },
+      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;
+        }else{
+          this.$message.warning('此单据已被锁定,请稍后再进行操作!')
+        }
+      },
+
       backToList() {
+        //如果为审核页面  则直接返回
+        if(this.viewDisabled || this.detailData.check){
+          this.$emit("goBack");
+          return
+        }
+
         if(contrastObj(this.form,this.oldForm) || contrastList(this.dataList,this.oldDataList)
         ){
           this.$confirm("是否保存当前页面？", "提示", {
@@ -633,9 +689,18 @@
             this.editCustomer(true)
           }).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/paymentSettle/configuration/mainList.json

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 80,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -38,18 +38,17 @@
         <el-button
           type="text"
           size="small"
-          icon="el-icon-edit"
-          @click.stop="editOpen(scope.row, 2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
           icon="el-icon-delete"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>
       </template>
+      <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">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
+      </template>
     </avue-crud>
   </basic-container>
   <detail-page
@@ -128,7 +127,7 @@
         this.$store.commit("PAY_IN_DETAIL");
       },
       //编辑打开
-      editOpen(row, status){
+      editOpen(row){
         const data = {
           moduleName: 'ff',
           tableName: 'finance_settlement',
@@ -139,8 +138,7 @@
           if (res.data.code == 200) {
             this.detailData = {
               disabled: true,
-              id: row.id,
-              status: status
+              id: row.id
             };
             this.show = false;
             this.$store.commit("PAY_IN_DETAIL");
@@ -148,8 +146,7 @@
         }).catch(error => {
           this.detailData = {
             disabled: true,
-            id: row.id,
-            status: status
+            id: row.id
           };
           this.show = false;
           this.$store.commit("PAY_IN_DETAIL");

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

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 80,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -38,18 +38,17 @@
         <el-button
           type="text"
           size="small"
-          icon="el-icon-edit"
-          @click.stop="editOpen(scope.row, 2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
           icon="el-icon-delete"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>
       </template>
+      <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">
+        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
+      </template>
     </avue-crud>
   </basic-container>
   <detail-page
@@ -115,7 +114,7 @@
         this.show = false;
       },
       //编辑打开
-      editOpen(row,status){
+      editOpen(row){
         const data = {
           moduleName: 'sf',
           tableName: 'finance_settlement',
@@ -126,16 +125,14 @@
           if (res.data.code == 200) {
             this.detailData = {
               disabled: true,
-              id: row.id,
-              status: status
+              id: row.id
             };
             this.show = false;
           }
         }).catch(error => {
           this.detailData = {
             disabled: true,
-            id: row.id,
-            status: status
+            id: row.id
           };
           this.show = false;
         })

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

@@ -16,7 +16,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 80,
   "searchIcon": true,
   "searchIndex": 2,
   "addBtnText": "创建单据",

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -12,7 +12,7 @@
                    v-if="viewDisabled"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
-                   @click.stop="openDisabled()">编辑
+                   @click.stop="openEdit()">编辑
         </el-button>
         <el-button type="primary"
                    size="small"
@@ -142,7 +142,9 @@
               <span v-else>{{ row.priceCategoryNames }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
+                style="width:90%"
                 v-if="row.$cellEdit"
                 v-model="row.invoiceWeight"
                 placeholder="请输入"
@@ -713,9 +715,6 @@ export default {
       this.contractDicList() //合同下拉列
       this.marketDialog = false;
     },
-    openDisabled(){
-      this.viewDisabled = false
-    },
     //选择货物品种
     choice(row) {
       this.dialogVisible = true;
@@ -857,6 +856,9 @@ export default {
           if (this.contactsData[i].actualQuantity === "") {
             return this.$message.error(`请输入第${i + 1}行的件数`);
           }
+          if (this.contactsData[i].invoiceWeight === (null || "" )) {
+            return this.$message.error(`请输入第${i + 1}行的发票重量`);
+          }
         }
 
         for (let i = 0; i < this.contactsData.length; i++) {
@@ -982,8 +984,25 @@ export default {
         this.$message.success("复制成功!")
       }
     },
+    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
+      }else{
+        this.$message.warning('此单据已被锁定,请稍后再进行操作!')
+      }
+    },
     //返回列表
-    backToList() {
+    async backToList() {
+      //如果单据已被锁定 并且编辑按钮存在  则直接返回
+      if(this.viewDisabled){
+        this.$emit("goBack");
+        return
+      }
+
       if (contrastObj(this.form, this.oldForm) || contrastList(this.contactsData, this.oldContactsData)
         || contrastList(this.upLoadData, this.oldUpLoadData)
       ) {
@@ -995,9 +1014,18 @@ export default {
           this.editCustomer(true)
         }).catch(() => {
           this.$emit("goBack");
+        }).finally(()=>{
+          if(this.form.id){
+            this.unLock(this.detailData.lockData);
+            this.leaveDetailsKey(this.$route.name);
+          }
         })
-      } else {
+      }else {
         this.$emit("goBack");
+        if (this.form.id) {
+          this.unLock(this.detailData.lockData);
+          this.leaveDetailsKey(this.$route.name);
+        }
       }
     },
     //列保存触发

src/views/importTrade/invoice/index.vue

@@ -42,13 +42,6 @@
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"
-          icon="el-icon-edit"
-          size="small"
-          @click.stop="editOpen(scope.row,2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
           icon="el-icon-delete"
           size="small"
           @click.stop="rowDel(scope.row,scope.index)"
@@ -56,10 +49,10 @@
         </el-button>
       </template>
       <template slot-scope="scope" slot="orderNo">
-        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.orderNo }}</span>
       </template>
       <template slot-scope="scope" slot="corpsName">
-        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.corpsName }}</span>
       </template>
       <template slot-scope="scope" slot="totalQuantity">
         <span>{{ scope.row.totalQuantity | roundNumbers}}</span>
@@ -177,11 +170,18 @@ export default {
       this.$store.commit("GO_IN_DETAIL");
     },
     //查看跳转页面
-    beforeOpenPage(row, status) {
+    beforeOpenPage(row) {
+      let lockData = {
+        moduleName: 'fh',
+        tableName: 'business_delivery',
+        billId: row.id,
+        no: localStorage.getItem('browserID'),
+        billNo:row.orderNo
+      }
       this.detailData = {
         id: row.id,
         view:true,
-        status: status
+        lockData:lockData
       };
       this.show = false;
       this.$store.commit("GO_IN_DETAIL");
@@ -195,14 +195,6 @@ export default {
       this.show = false;
       this.$store.commit("GO_IN_DETAIL");
     },
-    editOpen(row, status) {
-      this.detailData = {
-        id: row.id,
-        status: status
-      };
-      this.show = false;
-      this.$store.commit("GO_IN_DETAIL");
-    },
     //点击新增时触发
     beforeClose(done) {
       this.parentId = "";

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

@@ -16,7 +16,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 80,
   "searchIcon": true,
   "searchIndex": 2,
   "addBtnText": "创建单据",

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -12,7 +12,7 @@
                    v-if="viewDisabled"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
-                   @click.stop="openDisabled()">编辑
+                   @click.stop="openEdit()">编辑
         </el-button>
         <el-button type="primary"
                    size="small"
@@ -166,7 +166,9 @@
               <span v-else>{{ row.billWeight }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
+                style="width:90%"
                 v-if="row.$cellEdit"
                 v-model="row.invoiceWeight"
                 placeholder="请输入"
@@ -550,10 +552,6 @@ export default {
     }
   },
   methods: {
-    //编辑
-    openDisabled(){
-      this.viewDisabled = false
-    },
     //货物名称 回显
     valueName(value,row){
       this.$set(row,"priceCategory",value)
@@ -715,6 +713,9 @@ export default {
           if (this.contactsData[i].actualQuantity === (null || "" )) {
             return this.$message.error(`请输入第${i + 1}行的件数`);
           }
+          if (this.contactsData[i].invoiceWeight === (null || "" )) {
+            return this.$message.error(`请输入第${i + 1}行的发票重量`);
+          }
         }
 
         this.form.billNo =Array.from(new Set(this.contactsData.map(item =>{return item.billNo}))).join(",")
@@ -859,8 +860,26 @@ export default {
         this.$message.success("复制成功!")
       }
     },
+    //编辑
+    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
+      }else{
+        this.$message.warning('此单据已被锁定,请稍后再进行操作!')
+      }
+    },
     //返回列表
-    backToList() {
+    async backToList() {
+      //如果单据已被锁定 并且编辑按钮存在  则直接返回
+      if(this.viewDisabled){
+        this.$emit("goBack");
+        return
+      }
+
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
         || contrastList(this.upLoadData,this.oldUpLoadData)
       ){
@@ -871,10 +890,20 @@ export default {
         }).then(() => {
           this.editCustomer(true)
         }).catch(()=>{
+          this.unLock(this.lockData) //解锁
           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/importTrade/receipt/index.vue

@@ -42,13 +42,6 @@
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"
-          icon="el-icon-edit"
-          size="small"
-          @click.stop="editOpen(scope.row,2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
           icon="el-icon-delete"
           size="small"
           @click.stop="rowDel(scope.row,scope.index)"
@@ -177,10 +170,19 @@ export default {
     },
     //查看跳转页面
     beforeOpenPage(row, status) {
+      let lockData = {
+        moduleName: 'sh',
+        tableName: 'business_delivery',
+        billId: row.id,
+        no: localStorage.getItem('browserID'),
+        billNo:row.orderNo
+      }
+
       this.detailData = {
         id: row.id,
         view:true,
-        status: status
+        status: status,
+        lockData:lockData
       };
       this.show = false;
       this.$store.commit("TAKE_IN_DETAIL");

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

@@ -16,7 +16,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 150,
+  "menuWidth": 80,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/purchase/contract/detailsPage.vue

@@ -11,7 +11,7 @@
                    v-if="viewDisabled"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
-                   @click.stop="openDisabled()">编辑
+                   @click.stop="openEdit()">编辑
         </el-button>
 
         <el-dropdown style="padding: 0 6px;line-height: 0">
@@ -19,7 +19,7 @@
             type="primary"
             size="small"
             :loading="buttonLoading"
-            :disabled="!form.id || checkDisabled"
+            :disabled="!form.id || checkDisabled || 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"
+            :disabled="!form.id || checkDisabled || viewDisabled"
             size="small"
           >
             账单处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -52,11 +52,11 @@
           </el-dropdown-menu>
         </el-dropdown>
 
-        <el-dropdown style="padding: 0 8px;line-height: 0">
+        <el-dropdown style="padding: 0 6px;line-height: 0">
           <el-button
             type="success"
             :loading="buttonLoading"
-            :disabled="!form.id || checkDisabled"
+            :disabled="!form.id || checkDisabled || 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"
+          :disabled="disabled  || checkDisabled || viewDisabled"
           @click="editCustomer"
           :loading="buttonLoading"
         >保存数据
@@ -415,7 +415,6 @@ export default {
   },
   data() {
     return {
-      lockData:{},
       form: {},
       disabled: false,
       customerContact: {},
@@ -741,13 +740,6 @@ export default {
   },
   async created() {
     this.customerContact = await this.getColumnData(this.getColumnName(37), customerContact);
-    // this.lockData = {
-    //   moduleName: 'cg',
-    //   tableName: 'business_order',
-    //   billId: this.detailData.id,
-    //   billNo:this.detailData.srcBillNo,
-    //   no: localStorage.getItem('browserID')
-    // }
 
     //币别
     this.getWorkDicts("currency").then(res =>{
@@ -966,25 +958,10 @@ export default {
       }
     },
 
-    openDisabled() {
-      this.viewDisabled = false
-      this.checkDisabled = false
-    },
-
-    // async openDisabled(){
-    //   this.viewDisabled = false
-    //   this.checkDisabled = false
-    //   if(!await this.checkLocks(this.lockData)){
-    //     this.onLock(this.lockData)
-    //     this.viewDisabled = false
-    //     this.checkDisabled = false
-    //   }else{
-    //     this.$message.warning("此订单已被锁定,请稍后操作!")
-    //   }
-    // },
     selectionContact(row){
       this.selectContact = row;
     },
+
     //进入收货单
     beforePage(){
       if(this.verificationData()){
@@ -996,7 +973,7 @@ export default {
             }
           });
         }else{
-          const params = {
+          const params = {//你问我西厂算什么东西 东厂管的了的我要管  管不了的我也要管  先斩后奏 皇权特许  这 就是西厂
             id:this.form.id,
             orderItemIds:this.selectContact.map(i=>{return i.$index})
           }
@@ -1199,12 +1176,24 @@ export default {
         this.$message.success("复制成功!")
       }
     },
+    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.checkDisabled = false
+      }else{
+        this.$message.warning('此单据已被锁定,请稍后再进行操作!')
+      }
+    },
      backToList() {
-      //如果单据已被锁定 并且编辑按钮存在  则直接返回
-      // if(await this.checkLocks(this.lockData) && this.viewDisabled){
-      //   this.$emit("goBack");
-      //   return
-      // }
+      //编辑按钮存在 直接返回
+      if(this.viewDisabled){
+        this.$emit("goBack");
+        return
+      }
 
       this.orderFeesList = this.$refs.feeInfo.submitData();
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
@@ -1217,11 +1206,19 @@ export default {
         }).then(() => {
           this.editCustomer(true)
         }).catch(()=>{
-          // this.unLock(this.lockData) //解锁
           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/purchase/contract/index.vue

@@ -53,13 +53,6 @@
         <template slot-scope="scope" slot="menu">
           <el-button
             type="text"
-            icon="el-icon-edit"
-            size="small"
-            @click.stop="editOpen(scope.row,2)"
-          >编辑
-          </el-button>
-          <el-button
-            type="text"
             icon="el-icon-delete"
             size="small"
             @click.stop="rowDel(scope.row,scope.index)"
@@ -67,10 +60,10 @@
           </el-button>
         </template>
         <template slot-scope="scope" slot="orderNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+          <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.index)">{{ scope.row.strCorpName }}</span>
+          <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>
@@ -175,13 +168,23 @@ export default {
       this.show = false;
     },
     //查看跳转页面
-    beforeOpenPage(row, status) {
+    beforeOpenPage(row) {
+      let lockData = {
+        moduleName: 'cg',
+        tableName: 'business_order',
+        billId: row.id,
+        no: localStorage.getItem('browserID'),
+        billNo:row.orderNo
+      }
+
       this.detailData = {
         id: row.id,
         view:true,
-        status: status
+        lockData:lockData,
       };
+
       this.show = false;
+      this.$store.commit("ENTRANCE_IN_DETAIL");
     },
     //新增跳转页面
     beforeOpen(row, status) {
@@ -190,13 +193,7 @@ export default {
         status: status
       };
       this.show = false;
-    },
-    editOpen(row, status) {
-      this.detailData = {
-        id: row.id,
-        status: status
-      };
-      this.show = false;
+      this.$store.commit("ENTRANCE_IN_DETAIL");
     },
     //点击新增时触发
     beforeClose(done) {

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

@@ -15,7 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 80,
   "selectionWidth": 50,
   "align": "center",
   "dialogClickModal": false,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -12,7 +12,7 @@
                    v-if="viewDisabled"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
-                   @click.stop="openDisabled()">编辑
+                   @click.stop="openEdit()">编辑
         </el-button>
 
         <el-dropdown style="padding: 0 6px;line-height: 0">
@@ -31,7 +31,7 @@
           </el-dropdown-menu>
         </el-dropdown>
 
-        <el-dropdown style="padding: 0 8px;line-height: 0">
+        <el-dropdown style="padding: 0 6px;line-height: 0">
           <el-button
             type="warning"
             :loading="buttonLoading"
@@ -53,7 +53,7 @@
           </el-dropdown-menu>
         </el-dropdown>
 
-        <el-dropdown style="line-height: 0">
+        <el-dropdown style="padding: 0 6px;line-height: 0">
           <el-button
             type="success"
             :loading="buttonLoading"
@@ -72,15 +72,17 @@
           </el-dropdown-menu>
         </el-dropdown>
 
-        <el-button
-          class="el-button--small-yh"
-          type="primary"
-          size="small"
-          :disabled="disabled || checkDisabled"
-          :loading="buttonLoading"
-          @click="editCustomer"
-        >保存数据
-        </el-button>
+        <div>
+          <el-button
+            class="el-button--small-yh"
+            type="primary"
+            size="small"
+            :disabled="disabled || checkDisabled"
+            :loading="buttonLoading"
+            @click="editCustomer"
+          >保存数据
+          </el-button>
+        </div>
       </div>
     </div>
     <div class="customer-main">
@@ -449,6 +451,7 @@ export default {
       checkDisabled:false,
       viewDisabled:false,
       takeDisabled:false,
+      lockData:{},
       form: {},
       orderFeesList:[],
       orderFilesList:[],
@@ -739,11 +742,6 @@ export default {
     }
   },
   methods: {
-    //编辑按钮
-    openDisabled(){
-      this.viewDisabled = false
-      this.checkDisabled = false
-    },
     valueName(value,row){
       this.$set(row,"priceCategory",value.id)
     },
@@ -933,11 +931,11 @@ export default {
             id:this.form.id,
             orderItemIds:this.selection.map(i=>{return i.id})
           }
-          this.$router.$avueRouter.closeTag('/importTrade/invoice/index');
           this.$router.push({
             path: "/importTrade/invoice/index",
             query: {form: params},
           });
+          this.$router.$avueRouter.closeTag('/importTrade/invoice/index');
         }
       }
     },
@@ -1052,6 +1050,9 @@ export default {
                 this.afterEcho(res.data.data)
               }).finally(()=>{
                 this.buttonLoading = false
+                this.unLock(this.lockData) //解锁
+                this.viewDisabled = true  //禁止编辑
+                this.checkDisabled = true
               })
             }
           })
@@ -1164,7 +1165,25 @@ export default {
         this.$message.success("复制成功!")
       }
     },
+    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.checkDisabled = false
+      }else{
+        this.$message.warning('此单据已被锁定,请稍后再进行操作!')
+      }
+    },
     backToList() {
+      //如果单据已被锁定 并且编辑按钮存在  则直接返回
+      if(this.viewDisabled){
+        this.$emit("goBack");
+        return
+      }
+
       this.orderFeesList = this.$refs.feeInfo.submitData();
       if(contrastObj(this.form,this.oldForm) || contrastList(this.importInventoryData,this.oldInventoryData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
@@ -1177,9 +1196,18 @@ export default {
           this.editCustomer(true)
         }).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/salesManagement/salesContract/index.vue

@@ -53,13 +53,6 @@
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"
-          icon="el-icon-edit"
-          size="small"
-          @click.stop="editOpen(scope.row,2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
           icon="el-icon-delete"
           size="small"
           @click.stop="rowDel(scope.row,scope.index)"
@@ -67,10 +60,10 @@
         </el-button>
       </template>
       <template slot-scope="scope" slot="orderNo">
-        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.orderNo }}</span>
       </template>
       <template slot-scope="scope" slot="corpsName">
-        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.corpsName }}</span>
+        <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row)">{{ scope.row.corpsName }}</span>
       </template>
       <template slot-scope="scope" slot="orderQuantity">
         <span>{{ scope.row.orderQuantity | roundNumbers}}</span>
@@ -172,28 +165,33 @@ export default {
       };
       this.show = false;
     },
-    //查看跳转页面
-    beforeOpenPage(row, index) {
-      this.detailData = {
-        id: row.id,
-        view:true,
-      };
-      this.show = false;
-    },
     //新增跳转页面
     beforeOpen(row, status) {
+      let lockData = {
+        moduleName: 'xs',
+        tableName: 'business_order',
+        billId: row.id,
+        no: localStorage.getItem('browserID'),
+        billNo:row.orderNo
+      }
+
       this.detailData = {
         id: row.id,
-        status: status
+        view:true,
+        lockData:lockData,
       };
+
       this.show = false;
+      this.$store.commit("XSACE_IN_DETAIL");
     },
-    editOpen(row, status) {
+    //查看跳转页面
+    beforeOpenPage(row) {
       this.detailData = {
         id: row.id,
-        status: status
+        view:true
       };
       this.show = false;
+      this.$store.commit("XSACE_IN_DETAIL");
     },
     //点击新增时触发
     beforeClose(done) {

src/views/system/lock/config/mainList.json

@@ -27,7 +27,7 @@
       "overHidden": true,
       "searchSpan": 8
     },{
-      "label": "合同号",
+      "label": "系统编号",
       "prop": "billNo",
       "search": true,
       "index": 2,
@@ -35,9 +35,9 @@
       "overHidden": true,
       "searchSpan": 8
     },{
-      "label": "操作者",
+      "label": "操作员",
       "prop": "realName",
-      "search": false,
+      "search": true,
       "index": 3,
       "minWidth": 80,
       "overHidden": true,
@@ -45,7 +45,10 @@
     },{
       "label": "业务锁时间",
       "prop": "lockTime",
-      "search": false,
+      "search": true,
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
       "index": 4,
       "minWidth": 80,
       "overHidden": true,

src/views/workManagement/main-items/detailsPage.vue

@@ -814,6 +814,22 @@
         let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
         this.$set(this.formTwo,"createTime",strDate)
 
+        //备注格式
+        let remark = "收入:\n" +
+          "1、业务名称:\n" +
+          "2、费用明细:\n" +
+          "3、业务负责人:\n" +
+          "4、优惠合计:\n" +
+          "5、实际收费:\n" +
+          "6、付款人:\n" +
+          "7、收款时间:\n" +
+          "8、收款人:\n" +
+          "9、收款方式:\n" +
+          "10、备注/特别说明:";
+
+        this.$nextTick(() => {
+          this.$set(this.form,"remark",remark)
+        })
       }
       if(this.$route.query.itemId){
         this.id = this.$route.query.itemId