修改禅道1968 1966 19691972 1971

src/views/iosBasicData/AirtransportExport/bills/assembly/filescenter.vue

@@ -267,6 +267,8 @@ export default {
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'url', res.link)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileName', res.originalName)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileExt', res.originalName)
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', res.originalName.split('.')[0])
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'isImage',0)
       loading = false;
       done();
     },

src/views/iosBasicData/AirtransportImport/bills/assembly/filescenter.vue

@@ -267,6 +267,8 @@ export default {
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'url', res.link)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileName', res.originalName)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileExt', res.originalName)
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', res.originalName.split('.')[0])
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'isImage',0)
       loading = false;
       done();
     },

src/views/iosBasicData/OceanFreightImport/bills/assembly/filescenter.vue

@@ -270,6 +270,8 @@ export default {
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'url', res.link)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileName', res.originalName)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileExt', res.originalName)
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', res.originalName.split('.')[0])
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'isImage',0)
       loading = false;
       done();
     },

src/views/iosBasicData/SeafreightExportF/bills/assembly/edicode.vue

@@ -40,11 +40,11 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="IEMAL" prop="ediVaeno" >
+                            <el-form-item label="IEMAL" prop="ediIemail" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEMAL</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediVaeno"
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediIemail"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
                                           clearable placeholder="请输入IEMAL" ></el-input>

src/views/iosBasicData/SeafreightExportF/bills/assembly/filescenter.vue

@@ -273,6 +273,8 @@ export default {
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'url', res.link)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileName', res.originalName)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileExt', res.originalName)
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', res.originalName.split('.')[0])
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'isImage',0)
       loading = false;
       done();
     },

src/views/iosBasicData/decisionAnalysis/index.vue

@@ -149,6 +149,24 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "件数",
+                        prop: "quantity",
+                        width: '100',
+                        overHidden: true,
+                    },
+                    {
+                        label: "毛重",
+                        prop: "grossWeight",
+                        width: '100',
+                        overHidden: true,
+                    },
+                    {
+                        label: "体积",
+                        prop: "measurement",
+                        width: '100',
+                        overHidden: true,
+                    },
+                    {
                         label: "场站",
                         prop: "cyCnName",
                         search: true,
@@ -302,24 +320,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "件数",
-                        prop: "quantity",
-                        width: '100',
-                        overHidden: true,
-                    },
-                    {
-                        label: "毛重",
-                        prop: "grossWeight",
-                        width: '100',
-                        overHidden: true,
-                    },
-                    {
-                        label: "体积",
-                        prop: "measurement",
-                        width: '100',
-                        overHidden: true,
-                    },
-                    {
                         label: "人民币应收",
                         prop: "amountDr",
                         width: '120',
@@ -384,6 +384,24 @@ export default {
                 menu: false,
                 height: '90',
                 column: [
+                {
+                        label: "件数",
+                        prop: "quantity",
+                        width: '100',
+                        overHidden: true,
+                    },
+                    {
+                        label: "毛重",
+                        prop: "grossWeight",
+                        width: '100',
+                        overHidden: true,
+                    },
+                    {
+                        label: "体积",
+                        prop: "measurement",
+                        width: '100',
+                        overHidden: true,
+                    },
                     {
                         label: "Teu",
                         prop: "teu",

src/views/iosBasicData/finstlbills/index.vue

@@ -77,7 +77,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 12,
+        searchMenuSpan: 24,
         border: true,
         index: true,
         viewBtn: true,

src/views/tirePartsMall/configuration/commodity.json

@@ -72,6 +72,13 @@
       "overHidden": true
     },
     {
+      "label": "返利后单价",
+      "prop": "rebatePrice",
+      "overHidden": true,
+      "width": 120,
+      "cell": true
+    },
+    {
       "label": "库存",
       "prop": "inventory",
       "multiple": true,

src/views/tirePartsMall/purchaseService/returns/detailsPage.vue

@@ -40,7 +40,7 @@
                         审 批<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check">审批
+                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check||form.checkStatus=='审核完成'">审批
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>

src/views/tirePartsMall/purchasingManagement/financingProcurement/configuration/commodity.json

@@ -0,0 +1,174 @@
+{
+  "align": "center",
+  "height": "auto",
+  "calcHeight": 80,
+  "stripe": true,
+  "tip": false,
+  "addBtn": false,
+  "searchShow": true,
+  "searchShowBtn": false,
+  "menu": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 80,
+  "searchSpan": 8,
+  "searchMenuSpan": 16,
+  "searchMenuPosition": "right",
+  "border": true,
+  "index": true,
+  "selection": true,
+  "dialogClickModal": false,
+  "column": [
+    {
+      "label": "商品名称",
+      "prop": "cname",
+      "search": true,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "商品编码",
+      "prop": "code",
+      "search": true,
+      "overHidden": true,
+      "width": "120"
+    },
+    {
+      "label": "数量",
+      "prop": "goodsNum",
+      "slot": true,
+      "overHidden": true,
+      "width": 120
+    },
+    {
+      "label": "单价",
+      "prop":"price",
+      "overHidden": true,
+      "slot": true,
+      "width": 120,
+      "cell": true,
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "blur"
+      }]
+    },
+    {
+      "label": "批次号",
+      "prop": "dot",
+      "cell":true,
+      "width": "150",
+      "type": "select",
+      "disabled": true,
+      "allowCreate": true,
+      "filterable": true,
+      "dicData": [],
+      "props": {
+        "label": "dot",
+        "value": "dot"
+      },
+      "dicUrl": "/api/blade-sales-part/stockDesc/dotList",
+      "overHidden": true
+    },
+    {
+      "label": "返利后单价",
+      "prop": "rebatePrice",
+      "overHidden": true,
+      "width": 120,
+      "cell": true
+    },
+    {
+      "label": "库存",
+      "prop": "inventory",
+      "multiple": true,
+      "overHidden": true
+    },
+    {
+      "label": "商品分类",
+      "prop": "goodsTypeName",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "品牌",
+      "prop": "brandName",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "规格型号",
+      "prop": "specificationAndModel",
+      "slot": true,
+      "overHidden": true,
+      "search": true,
+      "width": "120"
+    },
+    {
+      "label": "花纹",
+      "prop": "brandItem",
+      "slot": true,
+      "overHidden": true,
+      "search": true
+    },
+    {
+      "label": "商品描述",
+      "prop": "goodsDescription",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "单位",
+      "prop": "unit",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "是否静音棉",
+      "prop": "originalFactory",
+      "type":"select",
+      "search":true,
+      "width": 120,
+      "dicData":[{
+        "label":"否",
+        "value":"0"
+      },{
+        "label":"是",
+        "value":"1"
+      }]
+    },
+    {
+      "label": "是否防爆",
+      "prop": "explosionProof",
+      "type":"select",
+      "search":true,
+      "width": 120,
+      "dicData":[{
+        "label":"否",
+        "value":0
+      },{
+        "label":"是",
+        "value":1
+      }]
+    },
+    {
+      "label": "是否自修补",
+      "prop": "selfRecovery",
+      "type":"select",
+      "search":true,
+      "width": 120,
+      "dicData":[{
+        "label":"否",
+        "value":"0"
+      },{
+        "label":"是",
+        "value":"1"
+      }]
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "slot": true
+    }
+  ]
+}

src/views/tirePartsMall/purchasingManagement/financingProcurement/configuration/commodityxsho.json

@@ -0,0 +1,181 @@
+{
+  "align": "center",
+  "height": "auto",
+  "calcHeight": 80,
+  "stripe": true,
+  "tip": false,
+  "addBtn": false,
+  "searchShow": true,
+  "searchShowBtn": false,
+  "menu": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 80,
+  "searchSpan": 8,
+  "searchMenuSpan": 8,
+  "searchMenuPosition": "right",
+  "border": true,
+  "index": true,
+  "selection": true,
+  "dialogClickModal": false,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "column": [
+    {
+      "label": "商品名称",
+      "prop": "cname",
+      "search": true,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "商品编号",
+      "prop": "code",
+      "search": true,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "数量",
+      "prop": "goodsNum",
+      "slot": true,
+      "overHidden": true,
+      "width": 120
+    },
+    {
+      "label": "单价",
+      "prop":"price",
+      "overHidden": true,
+      "slot": true,
+      "width": 120,
+      "cell": true,
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "blur"
+      }]
+    },
+    {
+      "label": "批次号",
+      "prop": "dot",
+      "cell":true,
+      "width": "150",
+      "type": "select",
+      "disabled": true,
+      "allowCreate": true,
+      "filterable": true,
+      "dicData": [],
+      "props": {
+        "label": "dot",
+        "value": "dot"
+      },
+      "dicUrl": "/api/blade-sales-part/stockDesc/dotList",
+      "overHidden": true
+    },
+    {
+      "label": "批次号",
+      "prop": "whether",
+      "type":"select",
+      "search":true,
+      "dicData":[{
+        "label":"否",
+        "value":"0"
+      },{
+        "label":"是",
+        "value":"1"
+      }]
+    },
+    {
+      "label": "库存",
+      "prop": "inventory",
+      "addDisabled": false,
+      "multiple": true,
+      "overHidden": true
+    },
+    {
+      "label": "规格型号",
+      "prop": "specificationAndModel",
+      "width": "120",
+      "slot": true,
+      "overHidden": true,
+      "search": true
+    },
+    {
+      "label": "公司",
+      "prop": "salesCompanyName",
+      "slot": true,
+      "width": "120",
+      "overHidden": true
+    },
+    {
+      "label": "商品分类",
+      "prop": "goodsTypeName",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "品牌",
+      "prop": "brandName",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "花纹",
+      "prop": "brandItem",
+      "width": "120",
+      "slot": true,
+      "overHidden": true,
+      "search": true
+    },
+    {
+      "label": "是否静音棉",
+      "prop": "originalFactory",
+      "type":"select",
+      "search":true,
+      "width": 120,
+      "dicData":[{
+        "label":"否",
+        "value":"0"
+      },{
+        "label":"是",
+        "value":"1"
+      }]
+    },
+    {
+      "label": "是否防爆",
+      "prop": "explosionProof",
+      "type":"select",
+      "search":true,
+      "width": 120,
+      "dicData":[{
+        "label":"否",
+        "value":0
+      },{
+        "label":"是",
+        "value":1
+      }]
+    },
+    {
+      "label": "是否自修补",
+      "prop": "selfRecovery",
+      "type":"select",
+      "search":true,
+      "width": 120,
+      "dicData":[{
+        "label":"否",
+        "value":"0"
+      },{
+        "label":"是",
+        "value":"1"
+      }]
+    },
+    {
+      "label": "共享公司",
+      "prop": "sharedCompany",
+      "slot": true,
+      "width": "120",
+      "overHidden": true
+    }
+  ]
+}

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -45,7 +45,7 @@
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item @click.native="examineBtn('审批')"
-                            :disabled="isExamineBtn && !detailData.check">审批
+                            :disabled="isExamineBtn && !detailData.check || form.checkStatus == '审核完成'">审批
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>
@@ -85,6 +85,14 @@
                             :remote="true" dataName="cname" @selectChange="dicChange('fundingPartyName', $event)"
                             :disabled="editButton"></dic-select>
                     </tempalte>
+                    <tempalte slot="refno" slot-scope="{ row }">
+                        <el-input placeholder="请输入 参考号" v-model="form.refno">
+                        </el-input>
+                    </tempalte>
+                    <tempalte slot="remarks" slot-scope="{ row }">
+                        <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks">
+                        </el-input>
+                    </tempalte>
                 </avue-form>
             </trade-card>
             <trade-card title="明细信息">
@@ -134,7 +142,11 @@
                                 </el-select>
                                 <span v-else>{{ row.dot }}</span>
                             </template>
-
+                            <template slot="rebatePrice" slot-scope="{ row }">
+                                <el-input v-if="!mingxibaocun" size="small" v-model="row.rebatePrice"
+                                    style="width: 100%"></el-input>
+                                <span v-else>{{ row.rebatePrice }}</span>
+                            </template>
                             <template slot="subTotalMoney" slot-scope="{ row }">{{ (row.goodsNum *
                                 row.price).toFixed(2) }}</template>
 
@@ -299,7 +311,11 @@
                                     style="width: 100%" />
                                 <!--<span v-else>{{ row.price }}</span>-->
                             </template>
-
+                            <template slot="rebatePrice" slot-scope="{row}">
+                                <el-input-number v-model="row.rebatePrice" size="small" :controls="false"
+                                    style="width: 100%" />
+                                <!--<span v-else>{{ row.price }}</span>-->
+                            </template>
                             <template slot-scope="scope" slot="menu">
                                 <el-button type="text" icon="el-icon-edit" size="small"
                                     @click.stop="importStagList(scope.row, scope.index)"
@@ -357,7 +373,7 @@ import M from "minimatch";
 import da from "element-ui/src/locale/lang/da";
 import { number } from "echarts";
 import { getDeptLazyTreeTwo } from "@/api/basicData/basicFeesDesc";
-import commodity from "../../configuration/commodity.json";
+import commodity from "./configuration/commodity.json";
 import dicSelect from "@/components/dicSelect/main";
 export default {
     name: "detailsPage",
@@ -702,13 +718,15 @@ export default {
                     label: '参考号',
                     prop: "refno",
                     disabled: false,
+                    span: 12,
                 },
                 {
                     label: '备注',
                     prop: "remarks",
                     type: 'textarea',
+                    span: 24,
                     disabled: false,
-                    minRows: 1
+                    minRows: 2
                 }]
             },
             formContacts: {},
@@ -761,214 +779,241 @@ export default {
                     name: "returnsAmount",
                     type: "sum"
                 }],
-                column: [{
-                    label: '商品名称',
-                    prop: 'goodsId',
-                    width: 200,
-                    disabled: false,
-                    remote: true,
-                    hide: true,
-                    overHidden: true,
-                    type: 'select',
-                    // dicData: [],
-                    props: {
-                        label: 'cname',
-                        value: 'id'
+                column: [
+                    {
+                        label: '商品名称',
+                        prop: 'goodsId',
+                        width: 200,
+                        disabled: false,
+                        remote: true,
+                        hide: true,
+                        overHidden: true,
+                        type: 'select',
+                        // dicData: [],
+                        props: {
+                            label: 'cname',
+                            value: 'id'
+                        },
+                        // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
+                        dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1"
+                        // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
                     },
-                    // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
-                    dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
-                    // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
-                }, {
-                    label: '商品名称',
-                    prop: 'goodsName',
-                    width: 200,
-                    disabled: false,
-                    remote: true,
-                    overHidden: true,
-                }, {
-                    label: '数量',
-                    prop: 'goodsNum',
-                    overHidden: true,
-                    disabled: false,
-                    cell: true,
-                    width: 100,
-                    rules: [{
-                        required: true,
-                        message: " ",
-                        trigger: "blur"
+                    {
+                        label: '商品名称',
+                        prop: 'goodsName',
+                        width: 200,
+                        disabled: false,
+                        remote: true,
+                        overHidden: true,
                     }, {
-                        validator: (rule, value, callback) => {
-                            console.log(this.formContacts.inventory);
-                            if (value < 0) {
-                                callback(new Error("数量不能小于0"));
-                            } else {
-                                callback();
-                            }
-                        },
-                        trigger: "blur"
-                    }]
-                },
-                {
-                    label: '价格',
-                    prop: 'price',
-                    overHidden: true,
-                    width: 100,
-                    disabled: false,
-                    cell: true,
-                    rules: [{
-                        required: true,
-                        message: " ",
-                        trigger: "blur"
+                        label: '数量',
+                        prop: 'goodsNum',
+                        overHidden: true,
+                        disabled: false,
+                        cell: true,
+                        width: 100,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }, {
+                            validator: (rule, value, callback) => {
+                                console.log(this.formContacts.inventory);
+                                if (value < 0) {
+                                    callback(new Error("数量不能小于0"));
+                                } else {
+                                    callback();
+                                }
+                            },
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: '价格',
+                        prop: 'price',
+                        overHidden: true,
+                        width: 100,
+                        disabled: false,
+                        cell: true,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }, {
+                            validator: (rule, value, callback) => {
+                                if (value < 0) {
+                                    callback(new Error("价格不能小于0"));
+                                } else {
+                                    callback();
+                                }
+                            },
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: '库存',
+                        prop: 'inventory',
+                        overHidden: true,
+                        width: 100
                     }, {
-                        validator: (rule, value, callback) => {
-                            if (value < 0) {
-                                callback(new Error("价格不能小于0"));
-                            } else {
-                                callback();
-                            }
+                        label: '批次号',
+                        prop: 'dot',
+                        cell: true,
+                        width: 120,
+                        type: "select",
+                        disabled: true,
+                        allowCreate: true,
+                        filterable: true,
+                        dicData: [],
+                        props: {
+                            label: "dot",
+                            value: "dot"
                         },
-                        trigger: "blur"
-                    }]
-                },
-                {
-                    label: '库存',
-                    prop: 'inventory',
-                    overHidden: true,
-                    width: 100
-                }, {
-                    label: '批次号',
-                    prop: 'dot',
-                    cell: true,
-                    width: 120,
-                    type: "select",
-                    disabled: true,
-                    allowCreate: true,
-                    filterable: true,
-                    dicData: [],
-                    props: {
-                        label: "dot",
-                        value: "dot"
+                        dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+                        overHidden: true,
+                    }, {
+                        label: '小计',
+                        prop: 'subTotalMoney',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    }, {
+                        label: '商品编码',
+                        prop: 'goodsNo',
+                        overHidden: true,
+                        disabled: false,
+                        width: 100
                     },
-                    dicUrl: "/api/blade-sales-part/stockDesc/dotList",
-                    overHidden: true,
-                }, {
-                    label: '小计',
-                    prop: 'subTotalMoney',
-                    overHidden: true,
-                    width: 100,
-                    disabled: true,
-                    editDisplay: false,
-                    addDisplay: false
-                }, {
-                    label: '商品编码',
-                    prop: 'goodsNo',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100
-                },
-                {
-                    label: '品牌',
-                    prop: 'brandName',
-                    disabled: false,
-                    width: 100,
-                    overHidden: true,
-                },
-                {
-                    label: '规格型号',
-                    prop: 'propertyName',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100
-                }, {
-                    label: '花纹',
-                    prop: 'pattern',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100
-                }, {
-                    label: '商品描述',
-                    prop: 'goodsDescription',
-                    disabled: false,
-                    overHidden: true,
-                    width: 100
-                },
-                {
-                    label: '单位',
-                    prop: 'units',
-                    type: "select",
-                    disabled: false,
-                    props: {
-                        label: "dictValue",
-                        value: "dictValue"
+                    {
+                        label: '品牌',
+                        prop: 'brandName',
+                        disabled: false,
+                        width: 100,
+                        overHidden: true,
+                    },
+                    {
+                        label: '规格型号',
+                        prop: 'propertyName',
+                        overHidden: true,
+                        disabled: false,
+                        width: 100
+                    }, {
+                        label: '花纹',
+                        prop: 'pattern',
+                        overHidden: true,
+                        disabled: false,
+                        width: 100
+                    }, {
+                        label: '商品描述',
+                        prop: 'goodsDescription',
+                        disabled: false,
+                        overHidden: true,
+                        width: 100
+                    },
+                    {
+                        label: '单位',
+                        prop: 'units',
+                        type: "select",
+                        disabled: false,
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit",
+                        overHidden: true,
+                        width: 100
                     },
-                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit",
-                    overHidden: true,
-                    width: 100
-                },
-
-                {
-                    label: '收货数量',
-                    prop: 'sendNum',
-                    overHidden: true,
-                    width: 100,
-                    disabled: true,
-                    editDisplay: false,
-                    addDisplay: false
-                },
-                // {
-                //     label: '退货数量',
-                //     prop: "returnsNumber",
-                //     overHidden: true,
-                //     width: 100,
-                //     disabled: true,
-                // },
-                // {
-                //     label: '退货金额',
-                //     prop: "returnsAmount",
-                //     overHidden: true,
-                //     width: 100,
-                //     disabled: true,
-                // },
-                // {
-                //     label: '利润',
-                //     prop: 'profit',
-                //     overHidden: true,
-                //     width: 100
-                // },
-
-                // {
-                //     label: '返利',
-                //     prop: 'thisAmount',
-                //     overHidden: true,
-                //     width: 100
-                // },
-                // {
-                //     label: '成本',
-                //     prop: 'costprie',
-                //     overHidden: true,
-                //     width: 100,
-                //     disabled: true,
-                //     editDisplay: false,
-                //     addDisplay: false
 
-                // },
-                // {
-                //     label: '毛利',
-                //     prop: 'grossProfit',
-                //     overHidden: true,
-                //     width: 100,
-                //     disabled: true,
-                //     editDisplay: false,
-                //     addDisplay: false
-                // },
-                {
-                    label: '备注',
-                    prop: "remarks",
-                    overHidden: true,
-                    width: 100,
-                    disabled: false,
+                    {
+                        label: '收货数量',
+                        prop: 'sendNum',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
+                    {
+                        label: '返利后单价',
+                        prop: 'rebatePrice',
+                        overHidden: true,
+                        width: 100,
+                        cell: true,
+                    },
+                    {
+                        label: '返利后成本价',
+                        prop: 'rebateCostprie',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
+                    {
+                        label: '返利后利润',
+                        prop: 'rebateProfit',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
+                    // {
+                    //     label: '退货数量',
+                    //     prop: "returnsNumber",
+                    //     overHidden: true,
+                    //     width: 100,
+                    //     disabled: true,
+                    // },
+                    // {
+                    //     label: '退货金额',
+                    //     prop: "returnsAmount",
+                    //     overHidden: true,
+                    //     width: 100,
+                    //     disabled: true,
+                    // },
+                    // {
+                    //     label: '利润',
+                    //     prop: 'profit',
+                    //     overHidden: true,
+                    //     width: 100
+                    // },
+
+                    // {
+                    //     label: '返利',
+                    //     prop: 'thisAmount',
+                    //     overHidden: true,
+                    //     width: 100
+                    // },
+                    // {
+                    //     label: '成本',
+                    //     prop: 'costprie',
+                    //     overHidden: true,
+                    //     width: 100,
+                    //     disabled: true,
+                    //     editDisplay: false,
+                    //     addDisplay: false
+
+                    // },
+                    // {
+                    //     label: '毛利',
+                    //     prop: 'grossProfit',
+                    //     overHidden: true,
+                    //     width: 100,
+                    //     disabled: true,
+                    //     editDisplay: false,
+                    //     addDisplay: false
+                    // },
+                    {
+                        label: '备注',
+                        prop: "remarks",
+                        overHidden: true,
+                        width: 100,
+                        disabled: false,
 
-                }
+                    }
                 ]
             },
             selectionMultilist: [], // 多选数据
@@ -1385,6 +1430,9 @@ export default {
                 size: page.pageSize
             }).then(res => {
                 console.log(res, 1213)
+                res.data.data.records.forEach(e => {
+                    e.rebatePrice = 0
+                })
                 const data = res.data.data;
                 this.page.total = data.total;
                 this.pageList.total = data.total
@@ -1509,6 +1557,7 @@ export default {
                         remarks: item.remarks,
                         // 判断批次号是否可以编辑
                         whether: item.whether,
+                        rebatePrice: item.rebatePrice,
                         // 批次号的状态
                         dotedittype: false,
                         // 价格数量
@@ -1518,7 +1567,6 @@ export default {
                         // 是否是编辑状态
                         mingxibaocun: true
                     })
-                    console.log(this.form.orderItemsList)
                 })
             }
             this.dialogVisible = false
@@ -1528,7 +1576,6 @@ export default {
             this.tableData = this.goodsListSave
             this.tableDataHandle()
         },
-
         //导入商品弹窗列表查询
         onLoadfun(page, params = {}) {
             console.log(params)
@@ -1544,6 +1591,9 @@ export default {
                 goodsTypeId: this.treeDeptId,
                 ...Object.assign(params, this.SelectSearch)
             }).then(res => {
+                res.data.data.records.forEach(e => {
+                    e.rebatePrice = 0
+                })
                 const data = res.data.data;
                 this.page.total = data.total;
                 this.pageList.total = data.total

src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -427,6 +427,20 @@ export default {
             label: '单据编号',
             prop: "ordNo",
             search: true,
+            width: 140,
+            overHidden: true,
+          },
+          {
+            label: '原融资金额',
+            prop: "primaryFundingAmount",
+            search: true,
+            width: 100,
+            overHidden: true,
+          },
+          {
+            label: '原数量',
+            prop: "primaryGoodsTotalNum",
+            search: true,
             overHidden: true,
           },
           {
@@ -587,6 +601,7 @@ export default {
     },
     confirm(row, index, type) {
       if (type == 1) {
+        if(row.goodsTotalShipNum==0) return   this.$message.error("入库数量为0，请先入库");
         this.$confirm('采购数量:' + row.goodsTotalNum + ',金额:' + row.totalMoney + '<br/>到货数量:' + row.goodsTotalShipNum + ',金额:' + row.goodsTotalShipAmount, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -42,7 +42,7 @@
                         审 批<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check">审批
+                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check||form.checkStatus=='审核完成'">审批
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>
@@ -117,6 +117,11 @@
                                     style="width: 100%"></el-input>
                                 <span v-else>{{ row.price }}</span>
                             </template>
+                            <template slot="rebatePrice" slot-scope="{ row }">
+                                <el-input v-if="!mingxibaocun" size="small" v-model="row.rebatePrice"
+                                    style="width: 100%"></el-input>
+                                <span v-else>{{ row.rebatePrice }}</span>
+                            </template>
                             <template slot="dot" slot-scope="{ row }">
                                 <el-select v-if="!mingxibaocun && row.whether == '1'" v-model="row.dot" allow-create
                                     filterable default-first-option @focus="picihaolistfun(row.goodsId)">
@@ -272,7 +277,11 @@
                                 <el-input-number v-model="row.price" size="small" :controls="false" style="width: 100%" />
                                 <!--<span v-else>{{ row.price }}</span>-->
                             </template>
-
+                            <template slot="rebatePrice" slot-scope="{row}">
+                                <el-input-number v-model="row.rebatePrice" size="small" :controls="false"
+                                    style="width: 100%" />
+                                <!--<span v-else>{{ row.price }}</span>-->
+                            </template>
                             <template slot-scope="scope" slot="menu">
                                 <el-button type="text" icon="el-icon-edit" size="small"
                                     @click.stop="importStagList(scope.row, scope.index)"
@@ -740,7 +749,7 @@ export default {
                         value: 'id'
                     },
                     // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
-                    dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
+                   dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1"
                     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
                 }, {
                     label: '商品名称',
@@ -880,6 +889,31 @@ export default {
                     addDisplay: false
                 },
                 {
+                        label: '返利后单价',
+                        prop: 'rebatePrice',
+                        overHidden: true,
+                        width: 100,
+                        cell: true,
+                    },
+                    {
+                        label: '返利后成本价',
+                        prop: 'rebateCostprie',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
+                    {
+                        label: '返利后利润',
+                        prop: 'rebateProfit',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
+                {
                     label: '退货数量',
                     prop: "returnsNumber",
                     overHidden: true,
@@ -1416,6 +1450,7 @@ export default {
                         remarks: item.remarks,
                         // 判断批次号是否可以编辑
                         whether: item.whether,
+                        rebatePrice: item.rebatePrice,
                         // 批次号的状态
                         dotedittype: false,
                         // 价格数量
@@ -1451,6 +1486,9 @@ export default {
                 goodsTypeId: this.treeDeptId,
                 ...Object.assign(params, this.SelectSearch)
             }).then(res => {
+                res.data.data.records.forEach(e => {
+                    e.rebatePrice = 0
+                })
                 const data = res.data.data;
                 this.page.total = data.total;
                 this.pageList.total = data.total

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -49,7 +49,7 @@
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item @click.native="examineBtn('审批')"
-                            :disabled="isExamineBtn && !detailData.check">审批
+                            :disabled="isExamineBtn && !detailData.check||form.checkStatus=='审核完成'">审批
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>
@@ -981,6 +981,33 @@ export default {
                     addDisplay: false
                 },
                 {
+                    label: '返利后单价',
+                    prop: 'rebatePrice',
+                    overHidden: true,
+                    width: 100,
+                    disabled: true,
+                    editDisplay: false,
+                    addDisplay: false
+                },
+                {
+                    label: '返利后成本价',
+                    prop: 'rebateCostprie',
+                    overHidden: true,
+                    width: 100,
+                    disabled: true,
+                    editDisplay: false,
+                    addDisplay: false
+                },
+                {
+                    label: '返利后利润',
+                    prop: 'rebateProfit',
+                    overHidden: true,
+                    width: 100,
+                    disabled: true,
+                    editDisplay: false,
+                    addDisplay: false
+                },
+                {
                     label: '退货数量',
                     prop: "returnsNumber",
                     overHidden: true,
@@ -1567,7 +1594,7 @@ export default {
                     whether: item.whether,
                     units: item.unit,
                     // 小计
-                    subTotalMoney: item.goodsNum * item.price,
+                    subTotalMoney: Number(item.goodsNum * item.price)?Number(item.goodsNum * item.price).toFixed(2):0,
                     // 备注
                     remarks: item.remarks,
                     // 批次号的状态
@@ -1676,6 +1703,7 @@ export default {
             for (let item of this.picihaolist) {
                 if (item.dot == value) {
                     this.$set(row, 'inventory', item.balanceQuantity)
+                    this.$set(row, 'rebatePrice', item.rebatePrice)
                 }
             }
         },
@@ -1955,6 +1983,7 @@ export default {
                                     if (res.data.data.records.length) {
                                         res.data.data.records.forEach(e => {
                                             if (e.paramValue == 1) {
+                                                if(!this.form.storageId) return this.$message.error('请选择仓库')
                                                 whetherExistenceFinancing({
                                                     bsType: "XS",
                                                     ...this.form

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -40,7 +40,7 @@
                         审 批<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check">审批
+                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check||form.checkStatus=='审核完成'">审批
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>