修改bug

src/components/crop-dialog/main.vue

@@ -34,6 +34,7 @@
               @selection-change="selectionChange"
               @on-load="onLoad"
               @tree-load="treeLoad"
+              :cell-style="cellStyle"
             >
             </avue-crud>
           </el-col>
@@ -110,8 +111,11 @@ export default {
     option.height = window.innerHeight - 500;
   },
   methods: {
-    init(){
-      this.portinfoVisible=true
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    init() {
+      this.portinfoVisible = true;
     },
     closed() {
       this.$refs.crud.toggleSelection();
@@ -119,7 +123,7 @@ export default {
     importCorp() {
       this.$emit("importCorp", {
         id: this.selectionList[0].id,
-        name:this.selectionList[0].cname
+        name: this.selectionList[0].cname
       });
       this.portinfoVisible = false;
     },

src/components/fee-info/main.vue

@@ -8,6 +8,7 @@
         :option="feeOption"
         @saveColumn="saveColumn"
         :summary-method="summaryMethod"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button
@@ -152,6 +153,7 @@
             @size-change="sizeChange"
             :page.sync="page"
             @on-load="onLoad"
+            :cell-style="cellStyle"
           >
           </avue-crud>
         </el-col>
@@ -260,6 +262,9 @@ export default {
     cropDialog
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     importCorp(row) {
       this.feeData.push({
         itemId: null,

src/components/part-dialog/main.vue

@@ -18,6 +18,7 @@
           @saveColumn="saveColumn"
           @selection-change="selectionChange"
           :summary-method="summaryMethod"
+          :cell-style="cellStyle"
         >
           <template slot="menuLeft">
             <el-button
@@ -38,7 +39,7 @@
               size="small"
               type="text"
               style="padding:4px 10px;float:left"
-              @click="rePick(row,index)"
+              @click="rePick(row, index)"
               >选择</el-button
             >
             <span> {{ row.goodName }}</span>
@@ -105,12 +106,15 @@ export default {
   },
   created() {},
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     rePick(row, index) {
-      console.log()
-      this.$emit('partReData',{
+      console.log();
+      this.$emit("partReData", {
         ...row,
         index: index
-      })
+      });
       // this.$message({
       //   type: "warning",
       //   message: "正在开发中!"

src/components/report-dialog/main.vue

@@ -16,6 +16,7 @@
       :page.sync="page"
       @current-change="currentChange"
       @size-change="sizeChange"
+      :cell-style="cellStyle"
     >
       <template slot-scope="{ row }" slot="name">
         <el-tag style="cursor:pointer" @click="goReport(row.name)">{{
@@ -81,8 +82,8 @@ export default {
     reportName: {
       type: String
     },
-    reportId:{
-      type:String
+    reportId: {
+      type: String
     }
   },
   filters: {
@@ -91,6 +92,9 @@ export default {
     }
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     onClose() {
       this.visible = false;
       Object.assign(this.$data, this.$options.data());
@@ -120,7 +124,7 @@ export default {
     switchDialog: function(i) {
       this.visible = i;
       this.query = {
-        name: this.reportName?this.reportName:this.$router.currentRoute.name
+        name: this.reportName ? this.reportName : this.$router.currentRoute.name
       };
       if (i) {
         this.getList();

src/components/upload-file/main.vue

@@ -12,6 +12,7 @@
         @row-del="rowDel"
         :upload-after="uploadAfter"
         @saveColumn="saveColumn"
+        :cell-style="cellStyle"
       >
         <template slot="menuLeft">
           <el-button
@@ -77,6 +78,9 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(35), option);
   },
   methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //新增附件上传保存触发
     rowSave(row, done, loading) {
       this.fileData.push(row);

src/views/basicData/commodityType/configuration/customerPurchase.json

@@ -94,7 +94,7 @@
             ]
         },{
             "label": "金额",
-            "prop": "typeno",
+            "prop": "amount",
             "index": 4,
             "width":150,
             "cell": true,

src/views/basicData/commodityType/configuration/specification.json

@@ -29,7 +29,7 @@
     },
     {
       "label": "描述",
-      "prop": "describe",
+      "prop": "description",
       "minWidth": 100,
       "cell": true
     },

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -69,6 +69,12 @@
                 >
                   <!--                  <el-option v-for="(item,index) in selectData" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>-->
                 </el-select>
+                <selectComponent
+                  v-else-if="item.prop === 'corpId'"
+                  v-model="form[item.prop]"
+                  :configuration="configuration"
+                  style="width: 100%"
+                />
                 <el-input
                   type="age"
                   v-else
@@ -302,6 +308,13 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      configuration: {
+        multipleChoices: false,
+        multiple: false,
+        collapseTags: false,
+        placeholder: "请点击右边按钮选择",
+        dicData: []
+      },
       sftOption: sftOption,
       sftData: [],
       text:
@@ -440,7 +453,7 @@ export default {
           },
           {
             label: "计量单位",
-            prop: "productCategory",
+            prop: "unit",
             rules: [
               {
                 required: false,
@@ -461,6 +474,17 @@ export default {
             ]
           },
           {
+            label: "供应商",
+            prop: "corpId",
+            rules: [
+              {
+                required: true,
+                message: " ",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
             label: "中文描述",
             prop: "nameDescription",
             span: 24,
@@ -775,6 +799,11 @@ export default {
           });
         }
         if (valid && valids) {
+          this.configuration.dicData.forEach(e => {
+            if (e.id == this.form.corpId) {
+              this.form.corpName = e.cname;
+            }
+          });
           const params = {
             ...this.form,
             type: 0,
@@ -924,6 +953,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-form-item__content {
+  line-height: 32px;
+}
 .back-icon {
   line-height: 64px;
   font-size: 20px;

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -2,17 +2,21 @@
   <div class="borderless">
     <div class="customer-head">
       <div class="customer-back">
-        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-                   @click="backToList">返回列表
+        <el-button
+          type="danger"
+          style="border: none;background: none;color: red"
+          icon="el-icon-arrow-left"
+          @click="backToList"
+          >返回列表
         </el-button>
       </div>
       <el-button
-          class="el-button--small-yh add-customer-btn"
-          type="primary"
-          :disabled="disabled"
-          @click="editProductInfo"
-          size="small"
-      >{{ form.id ? '确认修改' : '确认新增' }}
+        class="el-button--small-yh add-customer-btn"
+        type="primary"
+        :disabled="disabled"
+        @click="editProductInfo"
+        size="small"
+        >{{ form.id ? "确认修改" : "确认新增" }}
       </el-button>
     </div>
     <div style="margin-top: 60px">
@@ -21,16 +25,20 @@
         <avue-form ref="form" v-model="form" :option="option">
           <template slot="goodsTypeId" slot-scope="scope">
             <avue-input-tree
-                v-model="form.goodsTypeId"
-                :props="{ label: 'title', value: 'id' }"
-                multiple
-                placeholder=" "
-                type="tree"
-                :dic="dicData"/>
+              v-model="form.goodsTypeId"
+              :props="{ label: 'title', value: 'id' }"
+              multiple
+              placeholder=" "
+              type="tree"
+              :dic="dicData"
+            />
           </template>
           <template slot="corpId" slot-scope="scope">
-            <selectComponent v-model="form.corpId"
-                             :configuration="configuration" style="width: 100%"/>
+            <selectComponent
+              v-model="form.corpId"
+              :configuration="configuration"
+              style="width: 100%"
+            />
           </template>
           <template slot="a" slot-scope="scope">
             <el-input
@@ -46,7 +54,12 @@
   </div>
 </template>
 <script>
-import {getDetail, updateDetail, getDeptTree, priceDelete} from "@/api/basicData/commodityType";
+import {
+  getDetail,
+  updateDetail,
+  getDeptTree,
+  priceDelete
+} from "@/api/basicData/commodityType";
 
 export default {
   name: "detailsPage",
@@ -56,12 +69,12 @@ export default {
         multipleChoices: false,
         multiple: false,
         collapseTags: false,
-        placeholder: '请点击右边按钮选择',
+        placeholder: "请点击右边按钮选择",
         dicData: []
       },
       form: {},
       disabled: false,
-      userDialog: false,//供应商导入窗口
+      userDialog: false, //供应商导入窗口
       dicData: [],
       detailsSelect: {},
       option: {
@@ -78,7 +91,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "产品名称",
@@ -103,7 +116,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "花纹",
@@ -115,7 +128,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "品牌",
@@ -127,20 +140,23 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "状态",
             prop: "status",
             span: 8,
-            type: 'select',
-            dicData: [{
-              label: '正常',
-              value: 0
-            }, {
-              label: '停用',
-              value: 1
-            }],
+            type: "select",
+            dicData: [
+              {
+                label: "正常",
+                value: 0
+              },
+              {
+                label: "停用",
+                value: 1
+              }
+            ]
           },
           {
             label: "规格",
@@ -152,7 +168,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "规格1",
@@ -164,7 +180,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "规格2",
@@ -176,7 +192,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "级别",
@@ -188,7 +204,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "产地",
@@ -200,12 +216,12 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "三包",
             prop: "threeGuarantees",
-            span: 8,
+            span: 8
           },
           {
             label: "供应商",
@@ -217,11 +233,11 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "箱立方",
-            prop: "a",
+            prop: "cntrVolumn",
             span: 8,
             rules: [
               {
@@ -229,7 +245,7 @@ export default {
                 message: " ",
                 trigger: "blur"
               }
-            ],
+            ]
           },
           {
             label: "备注",
@@ -239,8 +255,8 @@ export default {
             span: 24
           }
         ]
-      },
-    }
+      }
+    };
   },
   //初始化查询
   created() {
@@ -249,10 +265,10 @@ export default {
     });
     if (this.$route.query.id) {
       getDetail(JSON.parse(this.$route.query.id)).then(res => {
-        this.form = res.data.data
-      })
+        this.form = res.data.data;
+      });
     } else {
-      this.$set(this.form, "goodsTypeId", this.$route.query.treeDeptId)
+      this.$set(this.form, "goodsTypeId", this.$route.query.treeDeptId);
     }
   },
   methods: {
@@ -267,25 +283,30 @@ export default {
       });
     },
     rowContactCell(row, index) {
-      this.$refs.crudContact.rowCell(row, index)
+      this.$refs.crudContact.rowCell(row, index);
     },
     rowPurchaseCell(row, index) {
-      this.$refs.crudPurchase.rowCell(row, index)
+      this.$refs.crudPurchase.rowCell(row, index);
     },
     //修改提交触发
     editProductInfo() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         //校验明细列表
         if (valid) {
+          this.configuration.dicData.forEach(e => {
+            if (e.id == this.form.corpId) {
+              this.form.corpName = e.cname;
+            }
+          });
           const params = {
             ...this.form,
-            type: 0,
-          }
+            type: 0
+          };
           updateDetail(params).then(res => {
             if (res.data.success) {
-              this.$message.success("操作成功！")
+              this.$message.success("操作成功！");
             }
-          })
+          });
         } else {
           return false;
         }
@@ -295,16 +316,15 @@ export default {
     backToList() {
       this.$router.$avueRouter.closeTag();
       this.$router.push({
-        path: '/basicData/productInformation/index',
+        path: "/basicData/productInformation/index",
         query: {}
       });
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
-
 .back-icon {
   line-height: 64px;
   font-size: 20px;
@@ -320,7 +340,8 @@ export default {
     margin: 1vh auto 0 !important;
     padding-bottom: 10px !important;
 
-    .el-dialog__body, .el-dialog__footer {
+    .el-dialog__body,
+    .el-dialog__footer {
       padding-bottom: 0 !important;
       padding-top: 0 !important;
     }

src/views/exportTrade/customerInquiry/index.vue

@@ -17,6 +17,7 @@
         @saveColumn="saveColumn"
         :cell-style="cellStyle"
         :summary-method="summaryMethod"
+        @selection-change="selectionChange"
       >
         <template slot-scope="{ row }" slot="createUser">
           <span>{{ row.createUserName }}</span>
@@ -201,6 +202,9 @@ export default {
         });
       });
     },
+    selectionChange(list){
+
+    },
     //查看跳转页面
     beforeOpenPage(row, status) {
       this.detailData = {

src/views/maintenance/priceLibrary/detailsPage.vue

@@ -142,7 +142,7 @@ export default {
           {
             label: "汇率",
             prop: "exchangeRate",
-            disabled:true,
+            disabled: true,
             span: 8
           },
           {
@@ -192,6 +192,11 @@ export default {
             prop: "greenback",
             span: 8
           },
+          { 
+            label: "采购价格",
+            prop: "purchaseAmount",
+            span: 8
+          },
           {
             label: "税率",
             prop: "taxRate",