进口 修改

src/components/fee-info/config/feeInfo.json

@@ -57,10 +57,9 @@
       "width": 150
     },
     {
-      "label": "计价单位",
-      "prop": "unit",
-      "index": 6,
-      "cell": true,
+      "label": "结算金额",
+      "prop": "settlmentAmount",
+      "index": 5,
       "overHidden": true,
       "width": 150
     },
@@ -79,6 +78,14 @@
       "width": 150
     },
     {
+      "label": "计价单位",
+      "prop": "unit",
+      "index": 9,
+      "slot": true,
+      "overHidden": true,
+      "width": 150
+    },
+    {
       "label": "备注",
       "prop": "remarks",
       "index": 9,

src/components/fee-info/main.vue

@@ -24,7 +24,7 @@
             size="small"
             @click.stop="rowAdd"
             :disabled="disabled"
-            >新增</el-button
+            >录入明细</el-button
           >
           <el-button
             type="warning"
@@ -152,6 +152,24 @@
           </el-select>
           <span v-else>{{ row.currency }}</span>
         </template>
+        <template slot="unit" slot-scope="{ row }">
+          <el-select
+            v-if="row.$cellEdit"
+            v-model="row.unit"
+            filterable
+            placeholder="请输入"
+            size="small"
+          >
+            <el-option
+              v-for="(item, index) in unitList"
+              :key="index"
+              :label="item.dictValue"
+              :value="item.dictValue"
+            >
+            </el-option>
+          </el-select>
+          <span v-else>{{ row.unit }}</span>
+        </template>
       </avue-crud>
     </basic-container>
     <el-dialog
@@ -270,6 +288,7 @@ export default {
       selectionList: [],
       reData: null,
       currencyList: [],
+      unitList:[],
       breakConfiguration:{
         multipleChoices:false,
         multiple:false,
@@ -320,6 +339,9 @@ export default {
     this.getWorkDicts("currency").then(res => {
       this.currencyList = res.data.data;
     });
+    this.getWorkDicts("unit").then(res =>{
+      this.unitList = res.data.data
+    })
   },
   components: {
     cropDialog,
@@ -329,7 +351,7 @@ export default {
     //选择费用
     selectValue(value,row){
       this.$set(row,"feeName",value.cname)
-      this.$set(row,"unit",value.unitno)
+      // this.$set(row,"unit",value.unitno)
       this.$set(row,"currency",value.fcyno)
       this.currencyChange(row)
     },
@@ -509,7 +531,7 @@ export default {
                 item.corpId = this.reData.corpId;
                 item.feeName = e.cname;
                 item.price = this.reData.price;
-                item.unit = e.unitno;
+                // item.unit = e.unitno;
                 item.quantity = this.reData.quantity;
                 item.amount = this.reData.amount;
                 item.currency = e.fcyno;
@@ -527,7 +549,7 @@ export default {
             corpId: null,
             feeName: e.cname,
             price: 0,
-            unit: e.unitno,
+            // unit: e.unitno,
             quantity: 0,
             amount: 0,
             currency: e.fcyno,

src/components/procurement/config/market.json

@@ -89,7 +89,14 @@
       "index": 8,
       "width":120,
       "overHidden": true
-    },{
+    },
+    {
+      "label": "箱号",
+      "prop": "cntrNo",
+      "index": 8,
+      "width":120
+    },
+    {
       "label": "件数",
       "prop": "orderQuantity",
       "index": 9,

src/components/procurement/config/purchase.json

@@ -51,8 +51,15 @@
       "prop": "itemType",
       "index": 5,
       "width":120
-    },{
-      "label": "数量",
+    },
+    {
+      "label": "箱号",
+      "prop": "cntrNo",
+      "index": 5,
+      "width":120
+    },
+    {
+      "label": "件数",
       "prop": "orderQuantity",
       "index": 6,
       "width":120

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -66,6 +66,8 @@
                        @change="accountNoChange"
                        :disabled="checkDisabled || auditDisabled"
                        clearable
+                       allow-create
+                       default-first-option
                        filterable>
               <el-option v-for="(item,index) in form.bankList"
                          :key="index"

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -84,6 +84,7 @@
               @click.stop="rowDel(scope.row,scope.index)"
             >删除
             </el-button>
+<!--            :disabled="!financeDisabled || financeButton"-->
           </template>
           <template slot-scope="{ row }" slot="currency">
             <el-select  v-if="row.$cellEdit" v-model="row.currency" size="small" placeholder="请选择 币别" clearable filterable>

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

@@ -125,31 +125,6 @@
       "width":120
     },
     {
-      "label": "币别",
-      "prop": "currency",
-      "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=currency",
-      "props": {
-        "label": "dictValue",
-        "value": "dictValue"
-      },
-      "index": 11,
-      "width":120
-    },
-    {
-      "label": "汇率",
-      "prop": "exRate",
-      "cell": true,
-      "index": 12,
-      "width":120
-    },
-    {
-      "label": "税率",
-      "prop": "taxRate",
-      "index": 13,
-      "width":100,
-      "cell": true
-    },{
       "label": "备注",
       "prop": "remarks",
       "index": 14,

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

@@ -18,6 +18,7 @@
   "menuWidth": 180,
   "searchIcon": true,
   "searchIndex": 2,
+  "addBtnText": "创建单据",
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "showSummary": true,

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -27,7 +27,7 @@
                    :loading="buttonLoading"
                    class="el-button--small-yh"
                    :disabled="true"
-                   @click.stop="">复制新单
+                   @click.stop="">复制单据
         </el-button>
         <el-button
           class="el-button--small-yh"
@@ -36,7 +36,7 @@
           :loading="buttonLoading"
           :disabled="disabled  || goodsDisable || viewDisabled"
           @click="editCustomer"
-        >{{ form.id ? '确认修改' : '确认新增' }}
+        >保存数据
         </el-button>
       </div>
     </div>
@@ -174,17 +174,6 @@
               ></el-input>
               <span v-else>{{ row.contractAmount }}</span>
             </template>
-            <template slot="currency" slot-scope="{ row }">
-              <el-select v-model="row.currency"
-                         v-if="row.$cellEdit"
-                         size="small"
-                         placeholder="请选择 币别"
-                         @change="currencyChange(row)"
-                         clearable filterable>
-                <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
-              </el-select>
-              <span v-else>{{ row.currency }}</span>
-            </template>
             <template slot="cntrNo" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-select v-if="row.$cellEdit"
@@ -204,18 +193,29 @@
               </el-select>
               <span v-else>{{ row.cntrNo }}</span>
             </template>
-            <template slot="taxRate" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.taxRate"
-                size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
-                autocomplete="off"
-              >
-                <i slot="suffix" style="margin-top:3px;margin-right: 10px;display:inline-block">%</i>
-              </el-input>
-              <span v-else>{{ row.taxRate | isPercentage}}</span>
-            </template>
+<!--            <template slot="currency" slot-scope="{ row }">-->
+<!--              <el-select v-model="row.currency"-->
+<!--                         v-if="row.$cellEdit"-->
+<!--                         size="small"-->
+<!--                         placeholder="请选择 币别"-->
+<!--                         @change="currencyChange(row)"-->
+<!--                         clearable filterable>-->
+<!--                <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>-->
+<!--              </el-select>-->
+<!--              <span v-else>{{ row.currency }}</span>-->
+<!--            </template>-->
+<!--            <template slot="taxRate" slot-scope="{ row }">-->
+<!--              <el-input-->
+<!--                v-if="row.$cellEdit"-->
+<!--                v-model="row.taxRate"-->
+<!--                size="small"-->
+<!--                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'-->
+<!--                autocomplete="off"-->
+<!--              >-->
+<!--                <i slot="suffix" style="margin-top:3px;margin-right: 10px;display:inline-block">%</i>-->
+<!--              </el-input>-->
+<!--              <span v-else>{{ row.taxRate | isPercentage}}</span>-->
+<!--            </template>-->
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                 type="text"
@@ -238,7 +238,7 @@
                          size="small"
                          :disabled="goodsDisable || viewDisabled"
                          @click="openMarketDialog"
-              >导入明细
+              >录入明细
               </el-button>
             </template>
           </avue-crud>
@@ -595,15 +595,15 @@ export default {
   },
   methods: {
     //币别选择
-    currencyChange(row){
-      if(row.currency == "CNY"){
-        this.$set(row,"exRate",1)
-      }else if(row.currency == "USD"){
-        this.$set(row,"exRate",6.3686)
-      }else{
-        this.$set(row,"exRate",7.1749)
-      }
-    },
+    // currencyChange(row){
+    //   if(row.currency == "CNY"){
+    //     this.$set(row,"exRate",1)
+    //   }else if(row.currency == "USD"){
+    //     this.$set(row,"exRate",6.3686)
+    //   }else{
+    //     this.$set(row,"exRate",7.1749)
+    //   }
+    // },
     //货品物种
     valueName(value, row) {
       this.$set(row, "priceCategory", value)
@@ -751,6 +751,22 @@ export default {
         item.contractNumber = item.orgOrderNo;
         item.contractAmount = item.amount;
         item.actualQuantity = item.orderQuantity;
+        getListOrgOrderNo(item.billNo,item.contractNumber,item.priceCategory).then(res => {
+          this.creditList = res.data
+          this.storageList = this.creditList.map(item =>{
+            let params ={
+              storageId:item.storageId,
+              stockName:item.stockName
+            }
+            return params
+          })
+          this.cntrNoList = this.creditList.map(item =>{
+            let params ={
+              cntrNo:item.cntrNo,
+            }
+            return params
+          })
+        })
         this.selectInventory(item);
         delete item.id
         this.$refs.crudContact.rowCellAdd(item);

src/views/importTrade/invoice/index.vue

@@ -37,7 +37,7 @@
                    type="success"
                    :disabled="true"
                    @click.stop=""
-        >复制新单
+        >复制单据
         </el-button>
         <el-button size="small"
                    type="info"

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

@@ -156,38 +156,6 @@
       ]
     },
     {
-      "label": "币别",
-      "prop": "currency",
-      "type": "select",
-      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=currency",
-      "props": {
-        "label": "dictValue",
-        "value": "dictValue"
-      },
-      "index": 11,
-      "width":120
-    },
-    {
-      "label": "汇率",
-      "prop": "exRate",
-      "cell": true,
-      "index": 12,
-      "width":120
-    },
-    {
-      "label": "税率",
-      "prop": "taxRate",
-      "index": 13,
-      "width":120,
-      "cell": true,
-      "rules": [
-        {
-          "required": false,
-          "message": " ",
-          "trigger": "blur"
-        }
-      ]
-    },{
       "label": "备注",
       "prop": "remarks",
       "index": 14,

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

@@ -18,6 +18,7 @@
   "menuWidth": 180,
   "searchIcon": true,
   "searchIndex": 2,
+  "addBtnText": "创建单据",
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "showSummary": true,

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -27,7 +27,7 @@
                    class="el-button--small-yh "
                    :disabled="true"
                    :loading="buttonLoading"
-                   @click.stop="">复制新单
+                   @click.stop="">复制单据
         </el-button>
         <el-button
           class="el-button--small-yh"
@@ -36,7 +36,7 @@
           :disabled="disabled || receiptDisable || viewDisabled"
           :loading="buttonLoading"
           @click="editCustomer"
-        >{{ form.id ? '确认修改' : '确认新增' }}
+        >保存数据
         </el-button>
       </div>
     </div>
@@ -187,29 +187,6 @@
               ></el-input>
               <span v-else>{{ row.contractAmount }}</span>
             </template>
-            <template slot="currency" slot-scope="{ row }">
-              <el-select v-model="row.currency"
-                         v-if="row.$cellEdit"
-                         size="small"
-                         placeholder="请选择 币别"
-                         @change="currencyChange(row)"
-                         clearable filterable>
-                <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
-              </el-select>
-              <span v-else>{{ row.currency }}</span>
-            </template>
-            <template slot="taxRate" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model="row.taxRate"
-                size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
-                autocomplete="off"
-              >
-                <i slot="suffix" style="margin-top:3px;margin-right: 10px;display:inline-block">%</i>
-              </el-input>
-              <span v-else>{{ row.taxRate | isPercentage}}</span>
-            </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                 type="text"
@@ -232,7 +209,7 @@
                          size="small"
                          :disabled="receiptDisable  || viewDisabled"
                          @click="commoditySelection"
-              >导入明细
+              >录入明细
               </el-button>
             </template>
           </avue-crud>
@@ -573,16 +550,6 @@ export default {
     }
   },
   methods: {
-    //币别选择
-    currencyChange(row){
-      if(row.currency == "CNY"){
-        this.$set(row,"exRate",1)
-      }else if(row.currency == "USD"){
-        this.$set(row,"exRate",6.3686)
-      }else{
-        this.$set(row,"exRate",7.1749)
-      }
-    },
     //货物名称 回显
     valueName(value,row){
       this.$set(row,"priceCategory",value)

src/views/importTrade/receipt/index.vue

@@ -36,7 +36,7 @@
                    type="success"
                    :disabled="true"
                    @click.stop=""
-        >复制新单
+        >复制单据
         </el-button>
         <el-button size="small"
                    type="info"

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

@@ -79,7 +79,7 @@
       "width":100,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": " ",
           "trigger": "blur"
         }

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

@@ -20,7 +20,7 @@
   "searchLabelWidth": 120,
   "searchIcon": true,
   "searchIndex": 2,
-  "addBtnText": "新单",
+  "addBtnText": "创建单据",
   "expand": true,
   "expandWidth": 38,
   "selectionWidth": 40,

src/views/purchase/contract/detailsPage.vue

@@ -13,33 +13,63 @@
                    :loading="buttonLoading"
                    @click.stop="openDisabled()">编辑
         </el-button>
-        <el-button type="warning"
-                   size="small"
-                   class="el-button--small-yh "
-                   :loading="buttonLoading"
-                   :disabled="!form.id || viewDisabled"
-                   @click.stop="applyPayment('申请')">申请货款
-        </el-button>
-        <el-button type="info"
-                   size="small"
-                   :loading="buttonLoading"
-                   :disabled="!form.id  || viewDisabled"
-                   @click="openApplicationDialog"
-        >查看付款记录
-        </el-button>
-        <el-button type="warning"
-                   size="small"
-                   class="el-button--small-yh "
-                   :loading="buttonLoading"
-                   :disabled="!form.id  || viewDisabled"
-                   @click.stop="applyPayment('收费')">退款
-        </el-button>
+
+        <el-dropdown style="padding: 0 8px;line-height: 0">
+          <el-button
+            type="warning"
+            :loading="buttonLoading"
+            :disabled="!form.id || viewDisabled"
+            size="small"
+          >
+            账单处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              :loading="buttonLoading"
+              :disabled="!form.id || viewDisabled"
+              @click.native="applyPayment('申请')">申请货款
+            </el-dropdown-item>
+            <el-dropdown-item
+              :loading="buttonLoading"
+              :disabled="!form.id  || viewDisabled"
+              @click.native="applyPayment('收费')">退款
+            </el-dropdown-item>
+            <el-dropdown-item
+              :loading="buttonLoading"
+              :disabled="!form.id  || viewDisabled"
+              @click.native="openApplicationDialog">查看付款记录
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+
+
+<!--        <el-button type="warning"-->
+<!--                   size="small"-->
+<!--                   class="el-button&#45;&#45;small-yh "-->
+<!--                   :loading="buttonLoading"-->
+<!--                   :disabled="!form.id || viewDisabled"-->
+<!--                   @click.stop="applyPayment('申请')">申请货款-->
+<!--        </el-button>-->
+<!--        <el-button type="info"-->
+<!--                   size="small"-->
+<!--                   :loading="buttonLoading"-->
+<!--                   :disabled="!form.id  || viewDisabled"-->
+<!--                   @click="openApplicationDialog"-->
+<!--        >查看付款记录-->
+<!--        </el-button>-->
+<!--        <el-button type="warning"-->
+<!--                   size="small"-->
+<!--                   class="el-button&#45;&#45;small-yh "-->
+<!--                   :loading="buttonLoading"-->
+<!--                   :disabled="!form.id  || viewDisabled"-->
+<!--                   @click.stop="applyPayment('收费')">退款-->
+<!--        </el-button>-->
         <el-button type="success"
                    size="small"
                    :loading="buttonLoading"
                    class="el-button--small-yh "
                    :disabled="true"
-                   @click.stop="">复制新单
+                   @click.stop="">复制单据
         </el-button>
         <el-button
           class="el-button--small-yh "
@@ -48,7 +78,7 @@
           :disabled="disabled  || viewDisabled"
           @click="editCustomer"
           :loading="buttonLoading"
-        >{{form.id?'确认修改':'确认新增'}}
+        >保存数据
         </el-button>
       </div>
     </div>
@@ -548,7 +578,8 @@ export default {
                 trigger: 'blur'
               }
             ]
-          }, {
+          },
+          {
             label: '合同重量(吨)',
             prop: 'contractWeight',
             rules: [
@@ -1188,6 +1219,7 @@ export default {
   position: fixed;
   right: 12px;
   top: 47px;
+  align-items: flex-start;
 }
 .required_fields{
   color: #F56C6C;

src/views/purchase/contract/index.vue

@@ -47,7 +47,7 @@
                      type="success"
                      :disabled="true"
                      @click.stop=""
-          >复制新单
+          >复制单据
           </el-button>
           <el-button size="small"
                      type="info"

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

@@ -78,7 +78,7 @@
       "width":100,
       "rules": [
         {
-          "required": true,
+          "required": false,
           "message": " ",
           "trigger": "blur"
         }

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

@@ -22,7 +22,7 @@
   "searchIndex": 2,
   "expandWidth": 38,
   "selectionWidth": 40,
-  "addBtnText": "新单",
+  "addBtnText": "创建单据",
   "expand": true,
   "rowKey": "id",
   "showSummary": true,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -14,32 +14,61 @@
                    :loading="buttonLoading"
                    @click.stop="openDisabled()">编辑
         </el-button>
-        <el-button type="info"
-                   size="small"
-                   class="el-button--small-yh"
-                   :loading="buttonLoading"
-                   @click.stop="openApplicationDialog">查看收款记录
-        </el-button>
-        <el-button type="warning"
-                   size="small"
-                   class="el-button--small-yh"
-                   :disabled="!form.id || viewDisabled"
-                   :loading="buttonLoading"
-                   @click.stop="applySettlement('收费')">生成账单
-        </el-button>
-        <el-button type="warning"
-                   size="small"
-                   class="el-button--small-yh"
-                   :disabled="!form.id  || viewDisabled"
-                   :loading="buttonLoading"
-                   @click.stop="applySettlement('申请')">退款
-        </el-button>
+
+        <el-dropdown style="padding: 0 8px;line-height: 0">
+          <el-button
+            type="warning"
+            :loading="buttonLoading"
+            :disabled="!form.id || viewDisabled"
+            size="small"
+          >
+            账单处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              :disabled="!form.id || viewDisabled"
+              :loading="buttonLoading"
+              @click.native="applySettlement('收费')">生成账单
+            </el-dropdown-item>
+            <el-dropdown-item
+              :disabled="!form.id  || viewDisabled"
+              :loading="buttonLoading"
+              @click.native="applySettlement('申请')">退款
+            </el-dropdown-item>
+            <el-dropdown-item
+              :loading="buttonLoading"
+              @click.native="openApplicationDialog">查看收款记录
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+
+
+<!--        <el-button type="warning"-->
+<!--                   size="small"-->
+<!--                   class="el-button&#45;&#45;small-yh"-->
+<!--                   :disabled="!form.id || viewDisabled"-->
+<!--                   :loading="buttonLoading"-->
+<!--                   @click.stop="applySettlement('收费')">生成账单-->
+<!--        </el-button>-->
+<!--        <el-button type="info"-->
+<!--                   size="small"-->
+<!--                   class="el-button&#45;&#45;small-yh"-->
+<!--                   :loading="buttonLoading"-->
+<!--                   @click.stop="openApplicationDialog">查看收款记录-->
+<!--        </el-button>-->
+<!--        <el-button type="warning"-->
+<!--                   size="small"-->
+<!--                   class="el-button&#45;&#45;small-yh"-->
+<!--                   :disabled="!form.id  || viewDisabled"-->
+<!--                   :loading="buttonLoading"-->
+<!--                   @click.stop="applySettlement('申请')">退款-->
+<!--        </el-button>-->
         <el-button type="success"
                    size="small"
                    class="el-button--small-yh"
                    :disabled="true"
                    :loading="buttonLoading"
-                   @click.stop="">复制新单
+                   @click.stop="">复制单据
         </el-button>
         <el-button
           class="el-button--small-yh"
@@ -48,7 +77,7 @@
           :disabled="disabled || viewDisabled"
           :loading="buttonLoading"
           @click="editCustomer"
-        >{{form.id?'确认修改':'确认新增'}}
+        >保存数据
         </el-button>
       </div>
     </div>
@@ -499,9 +528,8 @@ export default {
             ]
           },
           {
-            label: '业务员',
-            prop: 'salesName',
-            dicData: [],
+            label: '合同重量(吨)',
+            prop: 'contractWeight',
             rules: [
               {
                 required: false,
@@ -641,6 +669,18 @@ export default {
             ]
           },
           {
+            label: '业务员',
+            prop: 'salesName',
+            dicData: [],
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '包装要求',
             prop: 'packageRemarks',
             rules: [

src/views/salesManagement/salesContract/index.vue

@@ -45,7 +45,7 @@
                    type="success"
                    :disabled="true"
                    @click.stop=""
-        >复制新单
+        >复制单据
         </el-button>
         <el-button size="small"
                    type="info"