Merge branch 'fine_music_score' into jenkins

src/views/pms/product/components/ProductAttrDetail.vue

@@ -111,7 +111,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.stock"
-                :disabled="!isEdit"
+                :disabled="true"
               ></el-input>
             </template>
           </el-table-column>

src/views/pms/product/components/ProductInfoDetail.vue

@@ -70,7 +70,7 @@
           :disabled="!isEdit"
         ></el-input-number>
       </el-form-item>
-      <el-form-item label="商品库存：">
+      <!-- <el-form-item label="商品库存：">
         <el-input-number
           v-model="value.stock"
           type="number"
@@ -79,7 +79,7 @@
           class="number-input"
           :disabled="!isEdit"
         ></el-input-number>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="计量单位：">
         <el-input-number
           v-model="value.unit"

src/views/pms/purchaseList/index.vue

@@ -169,9 +169,9 @@
           <el-select size="small" v-model="editSkuInfo.productSkuId" style="width:100%" placeholder="请选择Sku">
             <el-option
               v-for="item in stockList"
-              :key="item.id"
+              :key="item.skuCode"
               :label="item.spText"
-              :value="item.id">
+              :value="item.skuCode">
             </el-option>
           </el-select>
         </el-form-item>
@@ -279,6 +279,7 @@ export default {
         if (!this.dialogVisible && this.$refs.productAttrCatForm) {
           this.$refs.productAttrCatForm.clearValidate()
         }
+        this.dialogVisible = false;
       },
     handleSearchList() {
       this.listQuery.pageNum = 1;