Преглед изворни кода

feat: 商品价目表增加价格有效期和工艺路线

liujt пре 5 дана
родитељ
комит
cad034f0f4

+ 1 - 1
src/views/commodityManagement/commodityPriceList/components/addDialog.vue

@@ -225,7 +225,7 @@
       v-show="activeComp == 'main'"
     />
     <template slot="footer">
-      <el-button type="primary" @click="save" v-if="type != 'view'"
+      <el-button :loading="loading" type="primary" @click="save" v-if="type != 'view'"
         >保存</el-button
       >
       <el-button @click="cancel">返回</el-button>

+ 17 - 16
src/views/commodityManagement/commodityPriceList/components/productTable.vue

@@ -95,15 +95,15 @@
           >
             <el-input
               v-model="scope.row.technologyRouteName"
-              :disabled="isContractId"
+              :disabled="type == 'view'"
               placeholder="请选择"
               @click.native="openVersion(scope.$index)"
             ></el-input>
           </el-form-item>
         </template>
-        <template v-slot:validityPeriod="scope">
+        <template v-slot:priceExpiryDate="scope">
           <el-form-item
-            :prop="'datasource.' + scope.$index + '.validityPeriod'"
+            :prop="'datasource.' + scope.$index + '.priceExpiryDate'"
             :rules="{
               required: false,
               message: '请选择',
@@ -113,7 +113,8 @@
             <el-date-picker
               style="width: 100%"
               clearable
-              v-model="scope.row.validityPeriod"
+              :disabled="type == 'view'"
+              v-model="scope.row.priceExpiryDate"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="请选择日期"
@@ -240,18 +241,18 @@ export default {
           align: 'center',
           width: 110
         },
-        // {
-        //   prop: 'technologyRouteName',
-        //   label: '工艺路线',
-        //   slot: 'technologyRouteName',
-        //   align: 'center'
-        // },
-        // {
-        //   prop: 'validityPeriod',
-        //   label: '价格有效期',
-        //   slot: 'validityPeriod',
-        //   align: 'center'
-        // },
+        {
+          prop: 'technologyRouteName',
+          label: '工艺路线',
+          slot: 'technologyRouteName',
+          align: 'center'
+        },
+        {
+          prop: 'priceExpiryDate',
+          label: '价格有效期',
+          slot: 'priceExpiryDate',
+          align: 'center'
+        },
         {
           width: 180,
           columnKey: 'action',