Browse Source

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

QuKatie 3 years ago
parent
commit
02bf2731f8
21 changed files with 357 additions and 181 deletions
  1. 2 2
      src/App.vue
  2. 8 0
      src/views/businessManagement/deliveryNotice/configuration/advantageProject.json
  3. 8 1
      src/views/businessManagement/deliveryNotice/configuration/bankOfDeposit.json
  4. 11 0
      src/views/businessManagement/deliveryNotice/configuration/customerContact.json
  5. 64 11
      src/views/businessManagement/deliveryNotice/detailsPageEdit.vue
  6. 1 0
      src/views/businessManagement/deliveryNotice/index.vue
  7. 8 0
      src/views/businessManagement/purchaseOrder/configuration/advantageProject.json
  8. 8 1
      src/views/businessManagement/purchaseOrder/configuration/bankOfDeposit.json
  9. 11 0
      src/views/businessManagement/purchaseOrder/configuration/customerContact.json
  10. 60 10
      src/views/businessManagement/purchaseOrder/detailsPageEdit.vue
  11. 1 0
      src/views/businessManagement/purchaseOrder/index.vue
  12. 8 0
      src/views/businessManagement/receipt/configuration/advantageProject.json
  13. 8 1
      src/views/businessManagement/receipt/configuration/bankOfDeposit.json
  14. 11 0
      src/views/businessManagement/receipt/configuration/customerContact.json
  15. 64 11
      src/views/businessManagement/receipt/detailsPageEdit.vue
  16. 1 0
      src/views/businessManagement/receipt/index.vue
  17. 8 0
      src/views/businessManagement/salesOrder/configuration/advantageProject.json
  18. 8 1
      src/views/businessManagement/salesOrder/configuration/bankOfDeposit.json
  19. 11 0
      src/views/businessManagement/salesOrder/configuration/customerContact.json
  20. 51 142
      src/views/businessManagement/salesOrder/detailsPageEdit.vue
  21. 5 1
      src/views/businessManagement/salesOrder/index.vue

+ 2 - 2
src/App.vue

@@ -25,10 +25,10 @@ export default {
 }
 .el-input.is-disabled .el-input__inner {
   color: #000000 !important;
-  background-color: #fcfcfc !important;
+  background-color: #fafafa !important;
 }
 .el-textarea.is-disabled .el-textarea__inner {
   color: #000000 !important;
-  background-color: #fcfcfc !important;
+  background-color: #fafafa !important;
 }
 </style>

+ 8 - 0
src/views/businessManagement/deliveryNotice/configuration/advantageProject.json

@@ -7,6 +7,7 @@
   "dialogWidth": "60%",
   "addBtn":false,
   "editBtn":false,
+  "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,
   "cancelBtn":false,
@@ -37,6 +38,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -51,6 +53,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -64,6 +67,7 @@
       "index": 3,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -78,6 +82,7 @@
       "width":260,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -91,6 +96,7 @@
       "index": 5,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -104,6 +110,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -117,6 +124,7 @@
       "index": 7,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 8 - 1
src/views/businessManagement/deliveryNotice/configuration/bankOfDeposit.json

@@ -13,6 +13,9 @@
   "selection": true,
   "menuWidth": 300,
   "dialogClickModal": false,
+  "addBtn":false,
+  "editBtn":false,
+  "delBtn": false,
   "column":[
     {
       "label": "排序",
@@ -20,6 +23,7 @@
       "type": "number",
       "index": 1,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -32,6 +36,7 @@
       "prop": "fileName",
       "index": 2,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -44,6 +49,7 @@
       "prop": "remarks",
       "index": 5,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -63,7 +69,8 @@
         "url": "link"
       },
       "hide": true,
-      "span": 24
+      "span": 24,
+      "overHidden": true
     }
   ]
 }

+ 11 - 0
src/views/businessManagement/deliveryNotice/configuration/customerContact.json

@@ -5,6 +5,7 @@
   "searchShow": true,
   "addBtn":false,
   "editBtn":false,
+  "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,
   "cancelBtn":false,
@@ -37,6 +38,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -50,6 +52,7 @@
       "index": 1,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -63,6 +66,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -76,6 +80,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -89,6 +94,7 @@
       "index": 4,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -102,6 +108,7 @@
       "index": 5,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -116,6 +123,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -129,6 +137,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -142,6 +151,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -155,6 +165,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 64 - 11
src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -13,6 +13,7 @@
         type="primary"
         @click="revokeOutGoods"
         v-if="form.deliveryStatus !== '录入'"
+        :disabled="detailData.seeDisabled"
       >撤销发货</el-button>
       <el-button
         class="el-button--small-yh add-customer-btn"
@@ -20,16 +21,18 @@
         type="primary"
         @click="sendOutGoods"
         v-if="form.deliveryStatus == '录入'"
+        :disabled="detailData.seeDisabled"
       >确认发货</el-button>
       <el-button
         class="el-button--small-yh add-customer-btn"
-        type="success" style="right: 140px;" @click="copyOrder">
+        type="success" style="right: 140px;" @click="copyOrder"
+        :disabled="detailData.seeDisabled">
         复制新单
       </el-button>
       <el-button
           class="el-button--small-yh add-customer-btn"
           type="primary"
-          :disabled="disabled"
+          :disabled="disabled || detailData.seeDisabled"
           @click="editCustomer(false)"
       >{{ form.id ? '确认修改' : '确认新增' }}
       </el-button>
@@ -44,10 +47,10 @@
                 <!--                <avue-input-tree v-if="item.prop === 'corpsTypeId'"  leaf-only multiple :props="{label:'title'}" v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"-->
                 <!--                ></avue-input-tree>-->
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
-                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="item.disabled"/>
+                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="item.disabled || detailData.seeDisabled"/>
                 <selectComponent v-else-if="item.prop === 'corpId' || item.prop === 'salesCompany'" v-model="form[item.prop]"
-                                 :configuration="configuration" style="width: 100%"/>
-                <el-select v-else-if="item.prop === 'deliveryStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="item.disabled">
+                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
+                <el-select v-else-if="item.prop === 'deliveryStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="item.disabled || detailData.seeDisabled">
                   <el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue" size="small"></el-option>
                 </el-select>
 <!--                <avue-input-tree-->
@@ -62,11 +65,11 @@
 <!--                  @change="warehouseTreeChange"-->
 <!--                >-->
 <!--                </avue-input-tree>-->
-                <el-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small">
+                <el-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in warehouseName" :key="index" :label="item.cname" :value="item.id" size="small"></el-option>
                 </el-select>
-                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled"></el-input>
+                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -86,21 +89,31 @@
           >
             <template slot="code" slot-scope="{row,index}">
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="commodityChoice(row)">选择</el-button>
+              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="commodityChoice(row)" :disabled="detailData.seeDisabled">选择</el-button>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                   type="text"
                   size="small"
                   @click="rowCell(row,index)"
+                  :disabled="detailData.seeDisabled"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDel(row, index)"
+                :disabled="detailData.seeDisabled"
+                v-if="!row.$cellEdit"
+              >删 除</el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
                          @click="commoditySelection"
+                         :disabled="detailData.seeDisabled"
               >录入明细
               </el-button>
               <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
@@ -130,7 +143,7 @@
           >
             <template slot="code" slot-scope="{row,index}">
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="choice(row)">选择</el-button>
+              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled">选择</el-button>
             </template>
             <template slot="corpId" slot-scope="{ row }">
               <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
@@ -144,14 +157,24 @@
                   type="text"
                   size="small"
                   @click="rowCellTwo(row,index)"
+                  :disabled="detailData.seeDisabled"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDelProject(row, index)"
+                :disabled="detailData.seeDisabled"
+                v-if="!row.$cellEdit"
+              >删 除</el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
                          @click="costIncrease"
+                         :disabled="detailData.seeDisabled"
               >录入明细
               </el-button>
             </template>
@@ -167,7 +190,37 @@
               @row-update="rowUpdateBankOfDeposit"
               @row-del="rowDelBankOfDeposit"
               :upload-after="uploadAfter"
-          ></avue-crud>
+              ref="uploadCrud"
+          >
+            <template slot="menuLeft">
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="small"
+                @click.stop="$refs.uploadCrud.rowAdd()"
+                :disabled="detailData.seeDisabled"
+              >上传</el-button
+              >
+            </template>
+            <template slot="menu" slot-scope="{ row, index }">
+              <el-button
+                size="small"
+                icon="el-icon-edit"
+                type="text"
+                @click="$refs.uploadCrud.rowEdit(row, index)"
+                :disabled="detailData.seeDisabled"
+              >编 辑</el-button
+              >
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDelBankOfDeposit(row, index)"
+                :disabled="detailData.seeDisabled"
+              >删 除</el-button
+              >
+            </template>
+          </avue-crud>
         </basic-container>
       </el-form>
     </div>

+ 1 - 0
src/views/businessManagement/deliveryNotice/index.vue

@@ -233,6 +233,7 @@ export default {
       // /deliveryNotice_detailsPageEdit
       this.detailData = {
         id: row.id,
+        seeDisabled: true,
       };
       this.isShow = false;
       this.$store.commit("IN_IN_DETAIL");

+ 8 - 0
src/views/businessManagement/purchaseOrder/configuration/advantageProject.json

@@ -7,6 +7,7 @@
   "dialogWidth": "60%",
   "addBtn":false,
   "editBtn":false,
+  "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,
   "cancelBtn":false,
@@ -37,6 +38,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -51,6 +53,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -64,6 +67,7 @@
       "index": 3,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -78,6 +82,7 @@
       "width":260,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -92,6 +97,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -105,6 +111,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -118,6 +125,7 @@
       "index": 7,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 8 - 1
src/views/businessManagement/purchaseOrder/configuration/bankOfDeposit.json

@@ -13,6 +13,9 @@
   "selection": true,
   "menuWidth": 300,
   "dialogClickModal": false,
+  "addBtn":false,
+  "editBtn":false,
+  "delBtn": false,
   "column":[
     {
       "label": "排序",
@@ -20,6 +23,7 @@
       "type": "number",
       "index": 1,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -32,6 +36,7 @@
       "prop": "fileName",
       "index": 2,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -44,6 +49,7 @@
       "prop": "remarks",
       "index": 5,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -63,7 +69,8 @@
         "url": "link"
       },
       "hide": true,
-      "span": 24
+      "span": 24,
+      "overHidden": true
     }
   ]
 }

+ 11 - 0
src/views/businessManagement/purchaseOrder/configuration/customerContact.json

@@ -5,6 +5,7 @@
   "searchShow": true,
   "addBtn":false,
   "editBtn":false,
+  "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,
   "cancelBtn":false,
@@ -33,6 +34,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -46,6 +48,7 @@
       "index": 1,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -59,6 +62,7 @@
       "index": 1,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -72,6 +76,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -85,6 +90,7 @@
       "index": 4,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -99,6 +105,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -113,6 +120,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -126,6 +134,7 @@
       "index": 6,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -140,6 +149,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -153,6 +163,7 @@
       "index": 6,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 60 - 10
src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -15,7 +15,7 @@
       <el-button
           class="el-button--small-yh add-customer-btn"
           type="primary"
-          :disabled="disabled"
+          :disabled="disabled || detailData.seeDisabled"
           @click="editCustomer(false)"
       >{{ form.id ? '确认修改' : '确认新增' }}
       </el-button>
@@ -30,14 +30,14 @@
                 <!--                <avue-input-tree v-if="item.prop === 'corpsTypeId'"  leaf-only multiple :props="{label:'title'}" v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"-->
                 <!--                ></avue-input-tree>-->
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
-                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small">
+                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="detailData.seeDisabled"/>
+                <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
                 <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"
-                                 :configuration="configuration" style="width: 100%"/>
-                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled"></el-input>
+                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
+                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -94,27 +94,37 @@
             </template>
             <template slot="code" slot-scope="{row,index}">
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="commodityChoice(row)">选择</el-button>
+              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="commodityChoice(row)" :disabled="detailData.seeDisabled">选择</el-button>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                   type="text"
                   size="small"
                   @click="rowCell(row,index)"
+                  :disabled="detailData.seeDisabled"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDel(row, index)"
+                :disabled="detailData.seeDisabled"
+                v-if="!row.$cellEdit"
+              >删 除</el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
                          @click="commoditySelection"
+                         :disabled="detailData.seeDisabled"
               >录入明细
               </el-button>
               <el-button type="warning"
                          icon="el-icon-plus"
                          size="small"
-                         :disabled="selection.length < 1"
+                         :disabled="selection.length < 1 || detailData.seeDisabled"
                          @click="getShipmentC">生成收货单
               </el-button>
               <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
@@ -135,7 +145,7 @@
           >
             <template slot="code" slot-scope="{row,index}">
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="choice(row)">选择</el-button>
+              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled">选择</el-button>
             </template>
             <template slot="corpId" slot-scope="{ row }">
               <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
@@ -149,14 +159,24 @@
                   type="text"
                   size="small"
                   @click="rowCellTwo(row,index)"
+                  :disabled="detailData.seeDisabled"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDelProject(row, index)"
+                :disabled="detailData.seeDisabled"
+                v-if="!row.$cellEdit"
+              >删 除</el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
                          @click="costIncrease"
+                         :disabled="detailData.seeDisabled"
               >录入明细
               </el-button>
             </template>
@@ -172,7 +192,37 @@
               @row-update="rowUpdateBankOfDeposit"
               @row-del="rowDelBankOfDeposit"
               :upload-after="uploadAfter"
-          ></avue-crud>
+              ref="uploadCrud"
+          >
+            <template slot="menuLeft">
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="small"
+                @click.stop="$refs.uploadCrud.rowAdd()"
+                :disabled="detailData.seeDisabled"
+              >上传</el-button
+              >
+            </template>
+            <template slot="menu" slot-scope="{ row, index }">
+              <el-button
+                size="small"
+                icon="el-icon-edit"
+                type="text"
+                @click="$refs.uploadCrud.rowEdit(row, index)"
+                :disabled="detailData.seeDisabled"
+              >编 辑</el-button
+              >
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDelBankOfDeposit(row, index)"
+                :disabled="detailData.seeDisabled"
+              >删 除</el-button
+              >
+            </template>
+          </avue-crud>
         </basic-container>
       </el-form>
     </div>

+ 1 - 0
src/views/businessManagement/purchaseOrder/index.vue

@@ -195,6 +195,7 @@ export default {
     beforeOpenPage(row, index) {
       this.detailData = {
         id: row.id,
+        seeDisabled: true,
       };
       this.isShow = false;
     },

+ 8 - 0
src/views/businessManagement/receipt/configuration/advantageProject.json

@@ -7,6 +7,7 @@
   "dialogWidth": "60%",
   "addBtn":false,
   "editBtn":false,
+  "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,
   "cancelBtn":false,
@@ -37,6 +38,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -51,6 +53,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -64,6 +67,7 @@
       "index": 3,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -78,6 +82,7 @@
       "width":260,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -91,6 +96,7 @@
       "index": 5,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -104,6 +110,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -117,6 +124,7 @@
       "index": 7,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 8 - 1
src/views/businessManagement/receipt/configuration/bankOfDeposit.json

@@ -13,6 +13,9 @@
   "selection": true,
   "menuWidth": 300,
   "dialogClickModal": false,
+  "addBtn":false,
+  "editBtn":false,
+  "delBtn": false,
   "column":[
     {
       "label": "排序",
@@ -20,6 +23,7 @@
       "type": "number",
       "index": 1,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -32,6 +36,7 @@
       "prop": "fileName",
       "index": 2,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -44,6 +49,7 @@
       "prop": "remarks",
       "index": 5,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -63,7 +69,8 @@
         "url": "link"
       },
       "hide": true,
-      "span": 24
+      "span": 24,
+      "overHidden": true
     }
   ]
 }

+ 11 - 0
src/views/businessManagement/receipt/configuration/customerContact.json

@@ -5,6 +5,7 @@
   "searchShow": true,
   "addBtn":false,
   "editBtn":false,
+  "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,
   "cancelBtn":false,
@@ -37,6 +38,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -51,6 +53,7 @@
       "index": 1,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -64,6 +67,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -77,6 +81,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -90,6 +95,7 @@
       "index": 4,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -103,6 +109,7 @@
       "index": 5,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -116,6 +123,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -129,6 +137,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -143,6 +152,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -156,6 +166,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 64 - 11
src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -13,6 +13,7 @@
         type="primary"
         @click="revokeInGoods"
         v-if="form.deliveryStatus !== '录入'"
+        :disabled="detailData.seeDisabled"
       >撤销收货</el-button>
       <el-button
         class="el-button--small-yh add-customer-btn"
@@ -20,16 +21,18 @@
         type="primary"
         @click="sendInGoods"
         v-if="form.deliveryStatus == '录入'"
+        :disabled="detailData.seeDisabled"
       >确认收货</el-button>
       <el-button
         class="el-button--small-yh add-customer-btn"
-        type="success" style="right: 140px;" @click="copyOrder">
+        type="success" style="right: 140px;" @click="copyOrder"
+        :disabled="detailData.seeDisabled">
         复制新单
       </el-button>
       <el-button
           class="el-button--small-yh add-customer-btn"
           type="primary"
-          :disabled="disabled"
+          :disabled="disabled || detailData.seeDisabled"
           @click="editCustomer(false)"
       >{{ form.id ? '确认修改' : '确认新增' }}
       </el-button>
@@ -44,10 +47,10 @@
                 <!--                <avue-input-tree v-if="item.prop === 'corpsTypeId'"  leaf-only multiple :props="{label:'title'}" v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"-->
                 <!--                ></avue-input-tree>-->
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
-                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="detailData.seeDisabled"/>
                 <selectComponent v-else-if="item.prop === 'corpId' || item.prop === 'salesCompany'" v-model="form[item.prop]"
-                                 :configuration="configuration" style="width: 100%"/>
-                <el-select v-else-if="item.prop === 'purchaseMode'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small">
+                                 :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
+                <el-select v-else-if="item.prop === 'purchaseMode'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in procurementMethodOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
 <!--                <avue-input-tree-->
@@ -62,11 +65,11 @@
 <!--                  @change="warehouseTreeChange"-->
 <!--                >-->
 <!--                </avue-input-tree>-->
-                <el-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small">
+                <el-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in warehouseName" :key="index" :label="item.cname" :value="item.id" size="small"></el-option>
                 </el-select>
-                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled"></el-input>
+                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -86,15 +89,24 @@
           >
             <template slot="code" slot-scope="{row,index}">
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="commodityChoice(row)">选择</el-button>
+              <el-button type="text" size="mini" style="padding:4px 10px;float:left" :disabled="detailData.seeDisabled" @click="commodityChoice(row)">选择</el-button>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                   type="text"
                   size="small"
                   @click="rowCell(row,index)"
+                  :disabled="detailData.seeDisabled"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDel(row, index)"
+                :disabled="detailData.seeDisabled"
+                v-if="!row.$cellEdit"
+              >删 除</el-button>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
               <el-input
@@ -110,6 +122,7 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="commoditySelection"
+                         :disabled="detailData.seeDisabled"
               >录入明细
               </el-button>
               <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
@@ -130,7 +143,7 @@
           >
             <template slot="code" slot-scope="{row,index}">
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="choice(row)">选择</el-button>
+              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled">选择</el-button>
             </template>
             <template slot="corpId" slot-scope="{ row }">
               <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
@@ -144,14 +157,24 @@
                   type="text"
                   size="small"
                   @click="rowCellTwo(row,index)"
+                  :disabled="detailData.seeDisabled"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDelProject(row, index)"
+                :disabled="detailData.seeDisabled"
+                v-if="!row.$cellEdit"
+              >删 除</el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
                          @click="costIncrease"
+                         :disabled="detailData.seeDisabled"
               >录入明细
               </el-button>
             </template>
@@ -167,7 +190,37 @@
               @row-update="rowUpdateBankOfDeposit"
               @row-del="rowDelBankOfDeposit"
               :upload-after="uploadAfter"
-          ></avue-crud>
+              ref="uploadCrud"
+          >
+            <template slot="menuLeft">
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="small"
+                @click.stop="$refs.uploadCrud.rowAdd()"
+                :disabled="detailData.seeDisabled"
+              >上传</el-button
+              >
+            </template>
+            <template slot="menu" slot-scope="{ row, index }">
+              <el-button
+                size="small"
+                icon="el-icon-edit"
+                type="text"
+                @click="$refs.uploadCrud.rowEdit(row, index)"
+                :disabled="detailData.seeDisabled"
+              >编 辑</el-button
+              >
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDelBankOfDeposit(row, index)"
+                :disabled="detailData.seeDisabled"
+              >删 除</el-button
+              >
+            </template>
+          </avue-crud>
         </basic-container>
       </el-form>
     </div>

+ 1 - 0
src/views/businessManagement/receipt/index.vue

@@ -243,6 +243,7 @@ export default {
       // /receipt_detailsPageEdit
       this.detailData = {
         id: row.id,
+        seeDisabled: true,
       };
       this.isShow = false;
       this.$store.commit("DOM_IN_DETAIL");

+ 8 - 0
src/views/businessManagement/salesOrder/configuration/advantageProject.json

@@ -7,6 +7,7 @@
   "dialogWidth": "60%",
   "addBtn":false,
   "editBtn":false,
+  "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,
   "cancelBtn":false,
@@ -37,6 +38,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -51,6 +53,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -64,6 +67,7 @@
       "index": 3,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -78,6 +82,7 @@
       "width":260,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -91,6 +96,7 @@
       "index": 5,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -104,6 +110,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -117,6 +124,7 @@
       "index": 7,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 8 - 1
src/views/businessManagement/salesOrder/configuration/bankOfDeposit.json

@@ -13,6 +13,9 @@
   "selection": true,
   "menuWidth": 300,
   "dialogClickModal": false,
+  "addBtn":false,
+  "editBtn":false,
+  "delBtn": false,
   "column":[
     {
       "label": "排序",
@@ -20,6 +23,7 @@
       "type": "number",
       "index": 1,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -32,6 +36,7 @@
       "prop": "fileName",
       "index": 2,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -44,6 +49,7 @@
       "prop": "remarks",
       "index": 5,
       "width":100,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -63,7 +69,8 @@
         "url": "link"
       },
       "hide": true,
-      "span": 24
+      "span": 24,
+      "overHidden": true
     }
   ]
 }

+ 11 - 0
src/views/businessManagement/salesOrder/configuration/customerContact.json

@@ -34,6 +34,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -47,6 +48,7 @@
       "index": 1,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -60,6 +62,7 @@
       "index": 1,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -73,6 +76,7 @@
       "index": 1,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -86,6 +90,7 @@
       "index": 2,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -99,6 +104,7 @@
       "index": 4,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -113,6 +119,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -127,6 +134,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -140,6 +148,7 @@
       "index": 6,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -154,6 +163,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -167,6 +177,7 @@
       "index": 6,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 51 - 142
src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -11,16 +11,18 @@
         class="el-button--small-yh add-customer-btn"
         style="right: 245px;"
         type="primary"
+        :disabled="detailData.seeDisabled"
       >生成采购单</el-button>
       <el-button
           class="el-button--small-yh add-customer-btn"
-          type="success" style="right: 140px;" @click="copyOrder">
+          type="success" style="right: 140px;" @click="copyOrder"
+          :disabled="detailData.seeDisabled">
         复制新单
       </el-button>
       <el-button
           class="el-button--small-yh add-customer-btn"
           type="primary"
-          :disabled="disabled"
+          :disabled="disabled || detailData.seeDisabled"
           @click="editCustomer(false)"
       >{{ form.id ? '确认修改' : '确认新增' }}
       </el-button>
@@ -80,7 +82,7 @@
               @saveColumn="saveColumn('goods')"
           >
             <template slot="code" slot-scope="{row,index}">
-              <el-button type="text" size="mini" style="float: right" @click="commodityChoice(row)" :disabled="detailData.seeDisabled">选择</el-button>
+              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="commodityChoice(row)" :disabled="detailData.seeDisabled">选择</el-button>
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
@@ -117,6 +119,7 @@
                 type="text"
                 @click="rowDel(row, index)"
                 :disabled="detailData.seeDisabled"
+                v-if="!row.$cellEdit"
               >删 除</el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
@@ -156,7 +159,7 @@
           >
             <template slot="code" slot-scope="{row,index}">
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="choice(row)" :disabled="detailData.seeDisabled">选择</el-button>
+              <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="choice(row)" :disabled="detailData.seeDisabled">选择</el-button>
             </template>
             <template slot="corpId" slot-scope="{ row }">
               <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
@@ -171,8 +174,16 @@
                   size="small"
                   @click="rowCellTwo(row,index)"
                   :disabled="detailData.seeDisabled"
-              >{{ row.$cellEdit ? '保存' : '修改' }}
+              >{{ row.$cellEdit ? '保 存' : '修  ' }}
               </el-button>
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDelProject(row, index)"
+                :disabled="detailData.seeDisabled"
+                v-if="!row.$cellEdit"
+              >删 除</el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
@@ -195,7 +206,37 @@
               @row-update="rowUpdateBankOfDeposit"
               @row-del="rowDelBankOfDeposit"
               :upload-after="uploadAfter"
-          ></avue-crud>
+              ref="uploadCrud"
+          >
+            <template slot="menuLeft">
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="small"
+                @click.stop="$refs.uploadCrud.rowAdd()"
+                :disabled="detailData.seeDisabled"
+              >上传</el-button
+              >
+            </template>
+            <template slot="menu" slot-scope="{ row, index }">
+              <el-button
+                size="small"
+                icon="el-icon-edit"
+                type="text"
+                @click="$refs.uploadCrud.rowEdit(row, index)"
+                :disabled="detailData.seeDisabled"
+              >编 辑</el-button
+              >
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDelBankOfDeposit(row, index)"
+                :disabled="detailData.seeDisabled"
+              >删 除</el-button
+              >
+            </template>
+          </avue-crud>
         </basic-container>
       </el-form>
     </div>
@@ -330,138 +371,6 @@
                      :disabled="tableDataCost.length !== 1">导入</el-button>
         </span>
     </el-dialog>
-    <!--    打印-->
-    <el-dialog
-        title="打印单"
-        append-to-body
-        class="el-dialogDeep"
-        :visible.sync="printVisible"
-        width="100%"
-        fullscreen
-        :close-on-click-modal="false"
-        :close-on-press-escape="false">
-      <div class="print-div">
-        <div
-            style="
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-item: center;
-            font-size: 24px;
-            margin-bottom: 5px;
-            width: 100%;
-            text-align: center;
-          "
-        >
-          <div><b>VITAL INDUSTRIAL GROUP LIMITED</b></div>
-          <div>NO.37 DONGHAI ROAD, QINGDAO, CHINA</div>
-          <div>TEL:0086-532-86019080 FAX:0086-532-86019080</div>
-          <div>
-            <b>COMMERCIAL INVOICE</b>
-            <span style="float: right">ORIGINAL</span>
-          </div>
-        </div>
-        <div class="print_table" style="display: flex">
-          <table
-              border="0"
-              cellspacing="0"
-              cellpadding="0"
-              style="width: 100%; line-height: 30px"
-          >
-            <tr>
-              <td colspan="5" rowspan="3">MESSERS:</td>
-              <td colspan="2">INVOICE NO.</td>
-              <td colspan="3"></td>
-            </tr>
-            <tr>
-              <td colspan="2">DATE</td>
-              <td colspan="3"></td>
-            </tr>
-            <tr>
-              <td colspan="2">INCOTERM .</td>
-              <td colspan="3"></td>
-            </tr>
-            <tr>
-              <td colspan="5">PI NO.:</td>
-              <td colspan="2">DELIVERY PORT</td>
-              <td colspan="3"></td>
-            </tr>
-            <tr>
-              <td rowspan="2">NO.</td>
-              <td rowspan="2">DESCRIPTION</td>
-              <td>THICK</td>
-              <td>LENGTH</td>
-              <td>WIDTH</td>
-              <td rowspan="2">SHEETS</td>
-              <td rowspan="2">CRATES</td>
-              <td>UNIT PRICE</td>
-              <td>TOTAL</td>
-              <td>T. AMOUNT</td>
-            </tr>
-            <tr>
-              <td>mm</td>
-              <td>mm</td>
-              <td>mm</td>
-              <td>US$/M²</td>
-              <td>M²</td>
-              <td>US$</td>
-            </tr>
-            <tr>
-              <td>1</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>2</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>3</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td colspan="9" style="text-align: right">FUMIGATION COST:</td>
-              <td></td>
-            </tr>
-            <tr>
-              <td colspan="9" style="text-align: right">INSURANCE:</td>
-              <td></td>
-            </tr>
-            <tr>
-              <td colspan="9" style="text-align: right">TOTAL:</td>
-              <td>0.00</td>
-            </tr>
-          </table>
-        </div>
-        <div class="print-footer" style="margin-top: 8px">
-          <div style="font-weight: bold">TOTAL AMOUNT: U.S. DOLLARS NINE THOUSAND FORTY SIX CENTS TWENTY FIVE ONLY.
-          </div>
-        </div>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -1043,10 +952,10 @@ export default {
       this.queryData(this.detailData.id)
     }
     if (this.detailData.seeDisabled) {
-      this.bankOfDeposit.column.forEach(item => {
-        item.editDisabled = true
-        item.addDisabled = true
-      })
+      // this.bankOfDeposit.column.forEach(item => {
+      //   item.editDisabled = true
+      //   item.addDisabled = true
+      // })
     }
     if (this.detailData.copyId) {
       this.queryData(this.detailData.copyId, true)

+ 5 - 1
src/views/businessManagement/salesOrder/index.vue

@@ -298,7 +298,11 @@ export default {
     },
     onLoad(page, params) {
       if (this.search.businesDate.length > 0) {
-        console.log(this.search.businesDate)
+        params = {
+          ...params,
+          businesStartDate: this.search.businesDate[0],
+          businesEndDate: this.search.businesDate[1],
+        }
       }
       if (params) {
         if (params.requiredDeliveryDate) {