暂存

src/styles/index.scss

@@ -608,29 +608,29 @@ aside {
     float: left;
     border: 1px solid rgb(220, 223, 230);
     box-sizing: border-box;
-    width: 102px;
-    height: 102px;
-    line-height: 102px;
+    width: 84px;
+    height: 84px;
+    line-height: 84px;
     text-align: center;
   }
   .Upload {
-    width: 102px;
-    height: 102px;
-    line-height: 102px;
+    width: 84px;
+    height: 84px;
+    line-height: 84px;
     text-align: center;
     position: absolute;
     line-height: 0px;
     top: 0;
     left: 0;
-    line-height: 102px;
+    line-height: 84px;
   }
   .fileUp {
     vertical-align: top;
   }
   .avatar {
-    width: 102px;
-    height: 102px;
-    line-height: 102px;
+    width: 84px;
+    height: 84px;
+    line-height: 84px;
     text-align: center;
   }
   .avatar-uploader .el-upload:hover {

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1876,12 +1876,12 @@ export default {
       width: 100%;
       li {
         float: left;
-        width: 107px;
-        height: 107px;
+        width: 89px;
+        height: 89px;
         padding: 0 5px 0 0;
         .img-show-li-div {
-          width: 102px;
-          height: 102px;
+          width: 84px;
+          height: 84px;
           border: 1px solid #dfe4ed;
           background: #dfe4ed;
           position: relative;

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -77,7 +77,7 @@
             <li v-if="ruleForm.proof_type === '2'" class="tupian">
               <div v-if="img_url" class="clearfix">
                 <img
-                  style="width: 102px; height: 102px"
+                  style="width: 84px; height: 84px"
                   :src="img_url"
                   class="avatar fl"
                 />

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -44,8 +44,8 @@
           <search-brand
             :value="ruleForm.brandid"
             :size="'mini'"
-            :disabled="type === 'view'"
-            :isDetail="type !== 'add'"
+            :disabled="true"
+            :isDetail="true"
             :names="brand_name"
             :placeholder="'品牌'"
             @searchChange="brandidsearchChange"
@@ -139,8 +139,8 @@
                 :placeholder="'分类'"
                 :size="'mini'"
                 :names="cat_id_name"
-                :disabled="type === 'view'"
-                :isDetail="type !== 'add'"
+                :disabled="true"
+                :isDetail="true"
                 @searchChange="cat_id_change"
               />
             </el-form-item>
@@ -864,6 +864,7 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          console.log(this.askItem);
           // const { can_id_arr } = this.askItem;
           this.is_noble = this.askItem.is_metal;
           this.cat_id_name = this.type === "add" ? this.askItem.cat_name : "";

src/views/purchaseIn/workbench/components/packForm.vue

@@ -636,8 +636,8 @@ export default {
 
       li {
         float: left;
-        width: 102px;
-        height: 102px;
+        width: 84px;
+        height: 84px;
         overflow: hidden;
         margin: 0 10px 10px 0;
         border: 1px solid rgb(220, 223, 230);

src/views/purchaseIn/workbench/detail.vue

@@ -61,7 +61,7 @@
                   >
                 </el-table>
               </li>
-              <li>重量：</li>
+              <li>总重量：</li>
               <li>{{ sitem.total_weight }}g</li>
               <li>是否多地：</li>
               <li>{{ sitem.is_addrs === "1" ? "多地" : "一地" }}</li>
@@ -119,7 +119,7 @@
         </template>
       </div>
       <div class="bottom">
-        <el-table
+         <el-table
           :data="tableData"
           border
           stripe
@@ -225,7 +225,7 @@
               </el-tooltip>
             </template>
           </el-table-column>
-        </el-table>
+        </el-table> 
       </div>
     </div>
     <div v-else>
@@ -356,7 +356,8 @@ export default {
         this.parmValue
       );
       if (code === 0) {
-        this.tableData = data;
+        const {list}=data
+        this.tableData = list;
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -388,7 +389,7 @@ export default {
       position: absolute;
       top: 16px;
       left: 16px;
-      width: 240px;
+      width: 220px;
       overflow: hidden;
       height: calc(100vh - 82px);
       .left-main {
@@ -404,7 +405,7 @@ export default {
     .p-right {
       top: 16px;
       right: 16px;
-      width: calc(100% - 278px);
+      width: calc(100% - 258px);
       height: calc(100vh - 276px);
       overflow-y: scroll;
       background: #fff;
@@ -431,7 +432,7 @@ export default {
       bottom: 16px;
       right: 16px;
       background: #fff;
-      width: calc(100% - 278px);
+      width: calc(100% - 258px);
       height: 180px;
       min-height: 180px;
       overflow-y: scroll;
@@ -466,11 +467,11 @@ export default {
           line-height: 25px;
 
           &:nth-child(2n + 1) {
-            width: 65px;
+            width: 60px;
             text-align: right;
           }
           &:nth-child(2n + 2) {
-            width: calc(100% - 65px);
+            width: calc(100% - 60px);
           }
         }
       }

src/views/sellOut/project/components/costFormAddEdit.vue

@@ -89,7 +89,7 @@
             <el-form-item label="商品图片" prop="good_img">
               <div v-if="ruleForm.good_img" class="clearfix">
                 <img
-                  style="width: 102px; height: 102px"
+                  style="width: 84px; height: 84px"
                   :src="ruleForm.good_img"
                   class="avatar fl"
                 />

src/views/serviceParam/supplier/components/baseForm.vue

@@ -453,7 +453,7 @@ export default {
       ],
       sourceoptions: [
         { value: "0", label: "客户提供" },
-        { value: "1", label: "供应商提供" },
+        { value: "1", label: "供应商" },
         { value: "2", label: "公司开发" },
       ],
       typeoptions: [
@@ -792,12 +792,12 @@ export default {
       width: 100%;
       li {
         float: left;
-        width: 107px;
-        height: 107px;
+        width: 89px;
+        height: 89px;
         padding: 0 5px 0 0;
         .img-show-li-div {
-          width: 102px;
-          height: 102px;
+          width: 84px;
+          height: 84px;
           border: 1px solid #dfe4ed;
           background: #dfe4ed;
           position: relative;