Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 77fe33ce3227c630f0f646e992e60916fd54dd34

 src/views/cms/modules/CuttingToolModal.vue

@@ -98,8 +98,8 @@
                slot-scope='text, record, index'
              >
                <div :key="col.dataIndex">
                  
          



                  <a-input
                    :value="text"
@@ -329,7 +329,7 @@
      }
      this.$nextTick(() => {
        this.form.setFieldsValue(
          pick(this.model, 'cuttingCode', 'cuttingName', 'cuttingCategory', 'storeLocation','cuttingModel', 'supplierId', 'minimumPackageUnit', 
          pick(this.model, 'cuttingCode', 'cuttingName', 'cuttingCategory', 'storeLocation','cuttingModel', 'supplierId', 'minimumPackageUnit',
          'cuttingMaterial','drawingNumber','inventoryWarning','remark')
        )
      })
@@ -354,6 +354,7 @@
        this.deletePropertiesIds.push(record.id);
      }
    },

    handleOk() {
      const that = this
      let dataSource = that.dataSource;
@@ -388,7 +389,7 @@
    handleCancel() {
      this.close()
    },
  

    //添加扩展属性
    addPropertiesList() {
      const temp = [...(this.dataSource || [])]