国内贸易修改

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -27,6 +27,18 @@
                 type="tree"
                 :dic="dicData"/>
           </template>
+          <template slot="corpId" slot-scope="scope">
+            <selectComponent v-model="form.corpId"
+                             :configuration="configuration" style="width: 100%"/>
+          </template>
+          <template slot="a" slot-scope="scope">
+            <el-input
+              v-input-limit="2"
+              v-model="form.a"
+              clearable
+              placeholder="请输入 箱立方"
+            ></el-input>
+          </template>
         </avue-form>
       </basic-container>
     </div>
@@ -39,6 +51,13 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      configuration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
       form: {},
       disabled: false,
       userDialog: false,//供应商导入窗口
@@ -188,6 +207,30 @@ export default {
             span: 8,
           },
           {
+            label: "供应商",
+            prop: "corpId",
+            span: 8,
+            rules: [
+              {
+                required: true,
+                message: " ",
+                trigger: "blur"
+              }
+            ],
+          },
+          {
+            label: "箱立方",
+            prop: "a",
+            span: 8,
+            rules: [
+              {
+                required: true,
+                message: " ",
+                trigger: "blur"
+              }
+            ],
+          },
+          {
             label: "备注",
             prop: "remarks",
             type: "textarea",

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

@@ -17,7 +17,8 @@
   "searchLabelWidth": 100,
   "showSummary": true,
   "searchIcon": true,
-  "searchIndex": 3,
+  "searchIndex": 2,
+  "searchSpan": 8,
   "summaryText": "合计",
   "sumColumnList": [
     {

src/views/businessManagement/deliveryNotice/index.vue

@@ -125,9 +125,9 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 4 !== 0){
-      const num = 4 - Number(i % 4)
-      this.option.searchMenuSpan = num * 6;
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
     this.option.column.forEach(item => {

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

@@ -16,7 +16,8 @@
   "dialogClickModal": false,
   "searchLabelWidth": 100,
   "searchIcon": true,
-  "searchIndex": 3,
+  "searchIndex": 2,
+  "searchSpan": 8,
   "column": [
     {
       "label": "销售订单号",

src/views/businessManagement/purchaseOrder/index.vue

@@ -91,6 +91,7 @@ export default {
         collapseTags: false,
         placeholder: "请点击右边按钮选择",
         dicData: [],
+        clearable: true,
       },
       search: {},
       form: {},
@@ -119,9 +120,9 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 4 !== 0){
-      const num = 4 - Number(i % 4)
-      this.option.searchMenuSpan = num * 6;
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
     this.option.column.forEach(item => {

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

@@ -16,8 +16,9 @@
   "dialogClickModal": false,
   "searchLabelWidth": 100,
   "searchIcon": true,
-  "searchIndex": 3,
+  "searchIndex": 2,
   "showSummary": true,
+  "searchSpan": 8,
   "summaryText": "合计",
   "sumColumnList": [
     {
@@ -51,14 +52,16 @@
       "prop": "corpId",
       "search": true,
       "index": 2,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "所属公司",
       "prop": "salesCompany",
       "search": true,
       "index": 5,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "type": "date",
@@ -71,28 +74,32 @@
       "search": true,
       "index": 8,
       "width": 100,
-      "pickerOptions": {}
+      "pickerOptions": {},
+      "overHidden": true
     },
     {
       "label": "入库数量",
       "prop": "totalQuantity",
       "search": false,
       "index": 8,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "入库金额",
       "prop": "deliveryAmount",
       "search": false,
       "index": 8,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "采购金额",
       "prop": "purchaseAmount",
       "search": false,
       "index": 8,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "type": "select",
@@ -105,14 +112,16 @@
       "prop": "purchaseMode",
       "search": true,
       "index": 1,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "仓库",
       "prop": "storageId",
       "search": true,
       "index": 7,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "制单人",
@@ -141,7 +150,8 @@
       "prop": "sysNo",
       "search": false,
       "index": 1,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -679,9 +679,9 @@ export default {
         this.oldFeesList = []
         this.oldUploadList = []
         this.oldForm = Object.assign({}, this.form)
-        this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
         this.oldFeesList = this.oldFeesList.concat(this.advantageProjectData)
         this.oldUploadList = this.oldUploadList.concat(this.bankOfDepositData)
+        this.oldGoodsList = this.oldGoodsList.concat(this.contactsData)
         if (isCopy) {
           delete this.form.id
           delete this.form.sysNo
@@ -697,7 +697,7 @@ export default {
             delete item.id
             delete item.pid
           })
-          form.deliveryStatus == '录入'
+          this.form.deliveryStatus == '录入'
         }
       });
     },
@@ -1128,6 +1128,10 @@ export default {
     },
     //返回列表
     backToList() {
+      console.log(contrastObj(this.form, this.oldForm))
+      console.log(contrastList(this.contactsData, this.oldGoodsList))
+      console.log(contrastList(this.advantageProjectData, this.oldFeesList))
+      console.log(contrastList(this.bankOfDepositData, this.oldUploadList))
       if (contrastObj(this.form, this.oldForm) ||
         contrastList(this.contactsData, this.oldGoodsList) ||
         contrastList(this.advantageProjectData, this.oldFeesList) ||

src/views/businessManagement/receipt/index.vue

@@ -25,6 +25,33 @@
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制新单</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
         </template>
+        <template slot="corpIdSearch">
+          <select-component
+            v-model="search.corpId"
+            :configuration="configuration"
+          ></select-component>
+        </template>
+        <template slot-scope="scope" slot="corpId">
+          {{ scope.row.corpsName }}
+        </template>
+        <template slot="salesCompanySearch">
+          <select-component
+            v-model="search.salesCompany"
+            :configuration="configuration"
+          ></select-component>
+        </template>
+        <template slot-scope="scope" slot="salesCompany">
+          {{ scope.row.salesCompanyName }}
+        </template>
+        <template slot="storageIdSearch">
+          <warehouseSelect
+            v-model="search.storageId"
+            :configuration="configuration"
+          ></warehouseSelect>
+        </template>
+        <template slot-scope="scope" slot="storageId">
+          {{ scope.row.storageName }}
+        </template>
         <template slot-scope="scope" slot="menu">
           <el-button
             type="text"
@@ -73,6 +100,14 @@ export default {
   },
   data() {
     return {
+      configuration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: "请点击右边按钮选择",
+        dicData: [],
+        clearable: true,
+      },
       form: {},
       search: {},
       option: {},
@@ -100,9 +135,9 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 4 !== 0){
-      const num = 4 - Number(i % 4)
-      this.option.searchMenuSpan = num * 6;
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
     this.option.column.forEach(item => {

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

@@ -5,6 +5,7 @@
   "searchShow": true,
   "addBtn":false,
   "editBtn":false,
+  "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,
   "cancelBtn":false,

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

@@ -18,7 +18,23 @@
   "dialogClickModal": false,
   "searchLabelWidth": 100,
   "searchIcon": true,
-  "searchIndex": 3,
+  "searchIndex": 2,
+  "searchSpan": 8,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "orderAmount",
+      "type": "sum"
+    },
+    {
+      "name": "debitAmount",
+      "type": "sum"
+    },
+    {
+      "name": "balanceAmount",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "销售订单号",
@@ -241,7 +257,7 @@
     {
       "label": "主订单号",
       "prop": "morderNo",
-      "search": true,
+      "search": false,
       "index": 23,
       "width": 100,
       "overHidden": true

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -28,14 +28,14 @@
             <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
                 <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'" v-model="form[item.prop]"
-                                 :configuration="configuration" style="width: 100%"/>
-                <el-select v-else-if="item.prop === 'paymentType'" 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 === '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>
-                <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>
@@ -45,17 +45,17 @@
           <el-row>
             <el-col v-for="(item,index) in contactInformation.column" :key="index" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <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"/>
-                <selectComponent v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]" :configuration="configuration" style="width: 100%"/>
-                <el-input v-else-if="(item.prop === 'advancePayment') || (item.prop === 'settlmentAmount')" v-model="form[item.prop]" size="small" autocomplete="off" @change="computedCost"></el-input>
-                <el-select v-else-if="item.prop === 'orderStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small">
+                <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 || detailData.seeDisabled"/>
+                <selectComponent v-else-if="item.prop === 'belongToCorpId'" v-model="form[item.prop]" :configuration="configuration" style="width: 100%" :disabled="detailData.seeDisabled"/>
+                <el-input v-else-if="(item.prop === 'advancePayment') || (item.prop === 'settlmentAmount')" v-model="form[item.prop]" size="small" autocomplete="off" @change="computedCost" :disabled="detailData.seeDisabled"></el-input>
+                <el-select v-else-if="item.prop === 'orderStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
-                <el-input type="age" v-else-if="item.prop === 'grossProfitRate'" v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入">
+                <el-input type="age" v-else-if="item.prop === 'grossProfitRate'" v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入" :disabled="detailData.seeDisabled">
                   <template   slot="append">%</template>
                 </el-input>
-                <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 v-else type="age" 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 v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -75,8 +75,8 @@
               @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>
               <span style="float: left;padding-top: 2px">{{ row.code }}</span>
-              <el-button type="text" size="mini" style="float: right" @click="commodityChoice(row)">选择</el-button>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
               <el-input
@@ -103,27 +103,37 @@
                   type="text"
                   size="small"
                   @click="rowCell(row,index)"
-              >{{ row.$cellEdit ? '保存' : '修改' }}
+                  :disabled="detailData.seeDisabled"
+              >{{ row.$cellEdit ? '保 存' : '修 改' }}
               </el-button>
+              <el-button
+                size="small"
+                icon="el-icon-delete"
+                type="text"
+                @click="rowDel(row, index)"
+                :disabled="detailData.seeDisabled"
+              >删 除</el-button>
             </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
-                         @click="commoditySelection">录入明细
+                         @click="commoditySelection"
+                         :disabled="detailData.seeDisabled">录入明细
               </el-button>
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
-                         @click="policy">政策
+                         @click="policy"
+                         :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="getShipmentD">生成发货单
               </el-button>
-              <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
+              <el-button type="info" :size="size" icon="el-icon-printer" :disabled="detailData.seeDisabled">报 表</el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -141,7 +151,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="float: right" @click="choice(row)" :disabled="detailData.seeDisabled">选择</el-button>
             </template>
             <template slot="corpId" slot-scope="{ row }">
               <selectComponent v-if="row.$cellEdit" v-model="row.corpId"
@@ -155,6 +165,7 @@
                   type="text"
                   size="small"
                   @click="rowCellTwo(row,index)"
+                  :disabled="detailData.seeDisabled"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
             </template>
@@ -163,6 +174,7 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="costIncrease"
+                         :disabled="detailData.seeDisabled"
               >录入明细
               </el-button>
             </template>
@@ -720,6 +732,7 @@ export default {
           }, {
             label: '所属公司',
             prop: 'belongToCorpId',
+            span: 16,
             rules: [
               {
                 required: false,
@@ -896,6 +909,7 @@ export default {
           }, {
             label: '客户全称',
             prop: 'corpId',
+            span: 16,
             rules: [
               {
                 required: true,
@@ -1020,18 +1034,16 @@ export default {
       this.statusOption = res.data.data
     })
     this.$set(this.form, 'orderStatus', '录入')
-    // this.optionPolicy.selectable = function(row, index) {
-    //   return false
-    // }
-    // this.customerBuyFree.selectable = function(row, index) {
-    //   return false
-    // }
     if (this.detailData.id) {
-      // let id = this.$route.query.id.replace(/\"/g, "")
       this.queryData(this.detailData.id)
     }
+    if (this.detailData.seeDisabled) {
+      this.bankOfDeposit.column.forEach(item => {
+        item.editDisabled = true
+        item.addDisabled = true
+      })
+    }
     if (this.detailData.copyId) {
-      // let id = this.$route.query.copyId.replace(/\"/g, "")
       this.queryData(this.detailData.copyId, true)
     }
   },

src/views/businessManagement/salesOrder/index.vue

@@ -120,9 +120,9 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 4 !== 0){
-      const num = 4 - Number(i % 4)
-      this.option.searchMenuSpan = num * 6;
+    if (i % 3 !== 0){
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
     this.option.column.forEach(item => {
@@ -238,6 +238,7 @@ export default {
     beforeOpenPage(row, index) {
       this.detailData = {
         id: row.id,
+        seeDisabled: true,
       };
       this.isShow = false;
     },
@@ -286,10 +287,8 @@ export default {
       this.single = list.length !== 1;
     },
     currentChange() {
-      console.log('1')
     },
     sizeChange() {
-      console.log('1')
     },
     //列表刷新触发
     refreshChange() {