Lijy 1 рік тому
батько
коміт
f8dc3ad755

+ 2 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/components/relatedProducts/relatedProducts.vue

@@ -124,8 +124,9 @@ function returnData() {
 }
 
 watchEffect(() => {
-    const { productTableList, height } = props
+    const { productTableList, height, productTableListValue = [] } = props
     productArrar.value = productTableList || []
+    productTable.value = productTableListValue.length > 0 ? productTableListValue : [{ index: 0 }]
     heightClass.value = !height ? '200px' : height
 });
 

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/business/component/stageSetting.vue

@@ -29,7 +29,7 @@
                         <el-table-column label="操作" fixed="right" width="200">
                             <template #default="scope">
                                 <el-button link type="primary" size="large" @click="addStage(scope.row)">编辑</el-button>
-                                <el-button link type="danger" size="large" @click="deteStage(+scope.$index)">删除</el-button>
+                                <el-button link type="danger" size="large" @click="deteStage(+scope.$index)" :disabled="scope.row.isFinish == 1">删除</el-button>
                                 <el-button link type="primary" size="large" @click="moveStage(+scope.$index, 'up')"
                                     v-if="scope.$index != 0">上移</el-button>
                                 <el-button link type="primary" size="large" @click="moveStage(+scope.$index, 'down')"